50 files changed, 67847 insertions, 62646 deletions

diff --git a/ChangeLog b/ChangeLog
index ac49849631..799c0f403e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-05  JP Rosevear <jpr@ximian.com>
+
+	* configure.in: bump version, requirements
+
 2004-03-02  Dan Winship  <danw@ximian.com>
 
 	* configure.in (DATASERVER_API_VERSION): Define this (the number
diff --git a/configure.in b/configure.in
index 07e20aeaf1..0b2a6112a4 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.4, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 1.5.5, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -983,9 +983,9 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=2.1.5
-GTKHTML_REQUIRED=3.1.8
-EDS_REQUIRED=0.0.7
+GAL_REQUIRED=2.1.6
+GTKHTML_REQUIRED=3.1.6
+EDS_REQUIRED=0.0.90
 BONOBOUI_REQUIRED=2.4.2
 
 AC_SUBST(GAL_REQUIRED)
@@ -1081,7 +1081,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 fi
 
 dnl --- evolution-calendar flags
-EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.1.6)
+EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.2 >= 2.1.8)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
diff --git a/po/am.po b/po/am.po
index 91721a3423..84904eafd5 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -48,8 +48,7 @@ msgstr ""
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr ""
 
@@ -89,20 +88,20 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -110,70 +109,70 @@ msgstr "አድራሻ"
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "ምርጫዎች..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "ወር"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 #, fuzzy
 msgid "_Contact"
 msgstr "ወር"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "አልተገኘም"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "በመጫን ላይ..."
@@ -187,41 +186,43 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "የግል"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "አውቶማቲክ"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -229,7 +230,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -237,64 +238,68 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+msgid "The URI that the address book will display"
+msgstr ""
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -338,7 +343,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -370,20 +375,22 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
-msgstr ""
+#, fuzzy
+msgid "Address Book Creation Assistant"
+msgstr "ቀን መቁጠሪያ"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "አድራሻ"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr ""
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "አድራሻ"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "ሁል ጊዜ"
 
@@ -393,57 +400,58 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "ጨርሷል"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "በፍጹም"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -453,30 +461,30 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "አንድ"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "ተመርጠዋል፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -487,7 +495,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -496,7 +504,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -504,39 +512,40 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "የኩነቶች መረጃ"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -545,7 +554,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -553,7 +562,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -563,50 +572,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -614,28 +624,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -643,19 +653,19 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -664,39 +674,39 @@ msgstr ""
 msgid "_Edit"
 msgstr "አስተካክል"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "የ_ፖርት ቍጥር፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr ""
 
@@ -819,7 +829,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr ""
 
@@ -910,10 +920,10 @@ msgstr "ምድብ... (_T)"
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -964,15 +974,15 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "አድራሻ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1962,161 +1972,174 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "መልዕክቶች"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "ቦታ፦"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "የተጠቃሚ ስም"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "መጀመሪያ"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "መሥራት"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "ሌላ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "ምንጭ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "ስልክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "የውይይት መድረክ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "አስተካክል"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "ሙሉ ስም"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr "ኢሜይል፦"
@@ -2278,11 +2301,11 @@ msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2368,13 +2391,13 @@ msgid "Email begins with"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
@@ -2391,101 +2414,101 @@ msgid "Type"
 msgstr "ዓይነት"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
-msgstr ""
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "ከውጭ አስገባ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "አትም"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ቁረጥ"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "ቅጂ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2494,8 +2517,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
 
@@ -2538,7 +2561,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "ኢሜይል"
 
@@ -2600,7 +2623,7 @@ msgid "Nickname"
 msgstr "ቅጽል ስም"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "ማስታወሻ"
 
@@ -2609,7 +2632,7 @@ msgid "Office"
 msgstr "ቢሮ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr ""
 
@@ -2729,68 +2752,74 @@ msgstr "ተመርጠዋል"
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "የፋይል ስም"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "መሥራት"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "መግለጫ የለም"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "የውይይት መድረክ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "የቤት ስልክ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "የግል"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "አርእስት"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "የቤት ፋክስ"
@@ -2800,8 +2829,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2832,7 +2861,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2852,8 +2881,9 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
-msgstr ""
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "አድራሻ"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -2982,8 +3012,9 @@ msgid "Add address to existing contact \"%s\""
 msgstr ""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "አድራሻ"
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -3037,17 +3068,37 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr ""
 
@@ -3139,7 +3190,7 @@ msgstr "ህዳጎች"
 msgid "Number of columns:"
 msgstr "የዐምድ ብዛት"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "&ምርጫዎች"
 
@@ -3317,8 +3368,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
@@ -3397,10 +3448,9 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr ""
 
@@ -3444,26 +3494,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
 msgstr "ክፈት"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3472,12 +3520,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3485,7 +3533,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3496,19 +3544,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "bonobo ማስጀመር አልቻልኩም!"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3644,24 +3692,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "ቦታ፦"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "ቀን መቁጠሪያ"
 
@@ -3688,7 +3742,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3710,78 +3764,78 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "ቀን መቁጠሪያ፦ (_A)"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3917,7 +3971,7 @@ msgstr "ሰዓትን"
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -3991,7 +4045,7 @@ msgid "hour(s)"
 msgstr "ሰዓት(ኦች)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "ደቂቃ(ዎች)"
 
@@ -4002,7 +4056,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "ያስችላል"
 
@@ -4053,7 +4107,7 @@ msgstr "30 ደቂቃ"
 msgid "60 minutes"
 msgstr "60 ደቂቃ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4078,7 +4132,7 @@ msgid "Days"
 msgstr "ቀን"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "አስቻለ"
 
@@ -4220,7 +4274,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "አጠቃላይ"
 
@@ -4311,7 +4365,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
@@ -4458,23 +4512,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr "ወደ"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4510,8 +4564,8 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
@@ -4539,10 +4593,21 @@ msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, c-format
+msgid "Select destination %s"
 msgstr ""
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "ቀን መቁጠሪያ"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "አድራሻ"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4645,7 +4710,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr ""
 
@@ -4669,23 +4734,31 @@ msgstr ""
 msgid "Meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
@@ -4766,29 +4839,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "ምንም"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4981,7 +5054,7 @@ msgstr ""
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "ቀን/ሰዓት፦"
@@ -5017,7 +5090,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "አስወግድ"
 
@@ -5056,7 +5129,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5081,7 +5154,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5094,7 +5167,7 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr ""
 
@@ -5107,7 +5180,7 @@ msgstr "ከፍ ያለ"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr ""
 
@@ -5126,7 +5199,7 @@ msgstr "የተለመደ"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr ""
 
@@ -5168,16 +5241,16 @@ msgstr "ቀላል"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5188,7 +5261,7 @@ msgstr "ሚስጢራዊ"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "መግለጫ"
 
@@ -5379,11 +5452,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "ማጠቃለያ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "ቀለም"
 
@@ -5408,7 +5480,7 @@ msgstr "n"
 msgid "S"
 msgstr "s"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "ምሥራቅ"
 
@@ -5440,10 +5512,10 @@ msgstr "አይ"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "ያልታወቀ"
@@ -5456,99 +5528,105 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "አትም"
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "ለጥፍ"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "ክፈት"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "በሌላ ስም አስቀምጥ"
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "ቅጂ"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "ምርጫዎች"
 
@@ -5635,7 +5713,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr ""
 
@@ -5690,26 +5768,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "ከሳዓት"
@@ -5890,7 +5968,7 @@ msgid "Send Latest Information"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
@@ -6347,12 +6425,12 @@ msgstr "ቅድሚያ"
 msgid "Web Page:"
 msgstr "ገጽ"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6360,7 +6438,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6368,41 +6446,51 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "በመጫን ላይ..."
+
+#: calendar/gui/gnome-cal.c:1763
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6522,16 +6610,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6539,7 +6627,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6547,12 +6635,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6741,49 +6829,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "ሁኔታ፦ %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "ቅድሚያ፦ %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL፦ %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "ምድቦች፦ %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
@@ -6792,40 +6880,40 @@ msgstr "የህትመት ቅንጅት"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 #, fuzzy
 msgid "_Task"
 msgstr "የማይፈለግ"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "አድራሻ"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "የፋይል ስም"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6878,25 +6966,25 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "የቀን መቁጠሪያ ኩነቶች"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -8552,7 +8640,7 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr ""
 
@@ -8633,7 +8721,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8641,45 +8729,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8687,62 +8771,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr ""
 
@@ -8852,21 +8936,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr ""
@@ -9005,7 +9102,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9136,20 +9233,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9210,21 +9294,27 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "የማይፈለግ"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9433,21 +9523,29 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
+#: camel/camel-vtrash-folder.c:44
+msgid "Cannot copy messages to the Trash folder"
+msgstr ""
+
+#: camel/camel-vtrash-folder.c:46
+msgid "Cannot copy messages to the Junk folder"
+msgstr ""
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9463,15 +9561,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "አድራሻ"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9491,68 +9584,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "የነበረው"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "ዝርዝር"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9567,7 +9658,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9576,12 +9667,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9595,25 +9686,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9669,27 +9760,35 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9698,64 +9797,64 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9763,24 +9862,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9801,7 +9910,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr ""
@@ -9879,8 +9988,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9892,57 +10001,57 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9961,51 +10070,48 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
 #, c-format
-msgid "Folder `%s' does not exist."
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:134
 #, c-format
-msgid "`%s' is not a maildir directory."
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10027,9 +10133,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr ""
@@ -10071,160 +10177,140 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
 msgstr ""
-"ፋይል `%s'ን መክፈት አልቻለም፦\n"
-"%s"
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, c-format
+msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10239,10 +10325,19 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10264,6 +10359,27 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10487,46 +10603,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10573,7 +10689,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -10653,7 +10769,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -10705,7 +10821,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10868,7 +10984,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -10974,34 +11090,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11116,82 +11232,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11199,49 +11315,49 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11249,13 +11365,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11597,7 +11713,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
@@ -11610,19 +11726,19 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "አስፈላጊ"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11704,7 +11820,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11720,7 +11836,7 @@ msgstr ""
 msgid "months"
 msgstr "ወር"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "ሴኮንዶች"
 
@@ -11890,7 +12006,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "ጁን"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "መለያ"
@@ -11998,9 +12114,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "ጉዳዩ"
 
@@ -12008,25 +12125,25 @@ msgstr "ጉዳዩ"
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -12066,15 +12183,15 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr ""
 
@@ -12123,9 +12240,9 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "ፖስታ"
 
@@ -12133,7 +12250,7 @@ msgstr "ፖስታ"
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12171,15 +12288,15 @@ msgstr ""
 msgid "[script]"
 msgstr "ጽሑፍ"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "ቋንቋ"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12255,7 +12372,6 @@ msgid "Unread messages"
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12263,386 +12379,406 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "የዶሴ ስም፦"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "በመጫን ላይ..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr ""
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"ን አጥፉ"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "መንቀሳቅስ"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "ምርጫዎች"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "አትም"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "ወደፊት፦"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "አታጥፋ"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "የነበረው"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "ያልተሰየመ"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "ደብቅ"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
@@ -12685,29 +12821,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "ከ"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -12721,8 +12862,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "ቀን"
 
@@ -12739,20 +12880,25 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "ያልታወቀ ስህተት፦ %s"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12764,64 +12910,64 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12866,56 +13012,62 @@ msgstr "አጣራዎች"
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "መልዕክት"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "አድራሻ"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "መልዕክቶች"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12924,7 +13076,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -12945,293 +13097,299 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
-msgid "Default forward style"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:12
-msgid "Default height of the Message Window"
+msgid "Default forward style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:13
-msgid "Default reply style"
+msgid "Default height of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:14
-msgid "Default width of the Message Window"
+msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Enable/disable caret mode"
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Height of the message-list pane"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Height of the message-list pane."
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13239,184 +13397,209 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "ከውጭ አስገባ"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr ""
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr ""
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "ከውጭ አስገባ"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "ከውጭ አስገባ"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "ከውጭ አስገባ"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13431,7 +13614,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13439,7 +13622,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13448,47 +13631,48 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
+#: mail/importers/netscape-importer.c:1677
+msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "ምርጫዎች"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "ከውጭ አስገባ"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr ""
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr ""
 
@@ -13528,19 +13712,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "የተጠቃሚ ስም"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
@@ -13589,29 +13773,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 #, fuzzy
 msgid "New Mail Message"
 msgstr "%s - መልዕክት"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 #, fuzzy
 msgid "_Mail Message"
 msgstr "መልዕክቶች"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "_አዲስ ዶሴ (_N)"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "ዶሴ (_F)"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13647,7 +13846,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -13669,119 +13868,115 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "ባልቲክ (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "ባልቲክ iso 8859"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "ቀለሞች (_O)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "ሴኔጋል"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "ምርጫዎች"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13791,481 +13986,477 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "የነበረው (_F)"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "ጨርሷል"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "አጣራዎች"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "የገጽ አናት"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "መልዕክቶች"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "ቀለም ምረጡ"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_ደህነት"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "ነባሮች"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "አስቻለ"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "ሙሉ ስም"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "ጁን"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "ስም"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "ጽሑፍ"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "አጥፉ..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "መግለጫ"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14284,7 +14475,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr ""
 
@@ -14296,168 +14487,168 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14491,39 +14682,39 @@ msgstr "መግለጫ"
 msgid "Security Information"
 msgstr "መረጃ"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "ዓይነት፦ %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "ተወው"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr ""
 
@@ -14625,20 +14816,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr ""
 
@@ -14955,91 +15146,18 @@ msgstr ""
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "ዶሴ"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "ዶሴን አስወግድ"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(ያልተሰየመ)"
@@ -15165,7 +15283,7 @@ msgstr ""
 msgid "_Import"
 msgstr "ከውጭ አስገባ"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15203,6 +15321,10 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15307,126 +15429,6 @@ msgstr ""
 msgid "Generic error"
 msgstr "አጠቃላይ ስህተት"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "አዲስ ዶሴ ፍጠር"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "የመድረክ ስም"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "ትንሽ ምልክቶች"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "ትልቅ ምልክቶች"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "አዲስ መድረክ"
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "አቋራጮች"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "በአዲስ መስኮት ውስጥ ክፈት"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "አስወግድ"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "አቋራጮች"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15437,11 +15439,6 @@ msgstr ""
 msgid "New"
 msgstr "አዲስ"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15703,54 +15700,54 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "ይሻሻል"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15813,7 +15810,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr ""
 
@@ -15879,11 +15876,11 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -15929,219 +15926,219 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr ""
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "ጥያቄ"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "n"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "እሺ"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "n"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "ክሮኤሽያ"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s በ %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "አስገባ (_I)"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
@@ -16736,16 +16733,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "አድራሻ"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "አድራሻ"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17191,10 +17190,6 @@ msgstr "ፎርማት (_M)"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "ክፈት"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "ፋይል ክፈት"
@@ -17560,22 +17555,6 @@ msgstr "ላክ / ተቀበል (_S)"
 msgid "_Window"
 msgstr "አሁኑኑ"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "እንደገና ይጫን"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17640,8 +17619,8 @@ msgstr "በምድብ ጋር (_C)"
 msgid "_Tasks"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -17882,23 +17861,23 @@ msgstr "ፈልግ"
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "ሰርዝ"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "ጽሑፍ"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "ፈልግ"
@@ -17913,6 +17892,62 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ፋይል `%s'ን መክፈት አልቻለም፦\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "ዶሴ"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "ዶሴን አስወግድ"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "አዲስ ዶሴ ፍጠር"
+
+#~ msgid "Group name:"
+#~ msgstr "የመድረክ ስም"
+
+#~ msgid "_Small Icons"
+#~ msgstr "ትንሽ ምልክቶች"
+
+#~ msgid "_Large Icons"
+#~ msgstr "ትልቅ ምልክቶች"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "አዲስ መድረክ"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "አቋራጮች"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "በአዲስ መስኮት ውስጥ ክፈት"
+
+#~ msgid "Re_move"
+#~ msgstr "አስወግድ"
+
+#~ msgid "Shortcuts"
+#~ msgstr "አቋራጮች"
+
+#~ msgid "Reload"
+#~ msgstr "እንደገና ይጫን"
+
 #, fuzzy
 #~ msgid "Work Address"
 #~ msgstr "አድራሻ"
@@ -18239,9 +18274,6 @@ msgstr ""
 #~ msgid "_Move..."
 #~ msgstr "መንቀሳቅስ... (_M)"
 
-#~ msgid "_New Folder"
-#~ msgstr "_አዲስ ዶሴ (_N)"
-
 #~ msgid "_Rename..."
 #~ msgstr "እንደገና ሰይም... (_R)"
 
diff --git a/po/az.po b/po/az.po
index 334ad4edd1..a147c9f1b7 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -49,8 +49,7 @@ msgstr "Avtomatik tamamlamanı buradan quraşdırın"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Əlaqələr"
 
@@ -90,19 +89,20 @@ msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
 msgid "Manager your S/Mime certificates here"
 msgstr "S/Mime vəsiqələrinizi buradan idarə edin"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, 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-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Yeni Ünvan Kitabçası"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -110,65 +110,65 @@ msgstr "Yeni Ünvan Kitabçası"
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Xassələr..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "Ə_laqə"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Yeni əlaqə yarat"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Əlaqə _Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Yeni əlaqə siyahısı yarat"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP vericisinə bağlanma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "IMAP vericisinə tanıdılma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 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:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Sxem mə'lumatını alma xətası"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Daşınır..."
 
@@ -185,39 +185,41 @@ msgstr ""
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' daşınır:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Bu Kompüterdə"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Şəxsi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "LDAP Vericilərində"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP Vericiləri"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Avtomatik Tamamlama Qovluqları"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -225,7 +227,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -233,19 +235,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Bu sorğu müvəffəqiyyətlə nəticələnmədi."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -253,7 +255,7 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi. Xahiş edirik, cığırın mövcud olduğunu və "
 "üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -261,7 +263,7 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi. Ya səhv URI bildirdiniz, ya da LDAP "
 "vericisinə yetişilə bilmir."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -271,7 +273,7 @@ msgstr ""
 "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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -279,27 +281,32 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi.  Ya səhv URL bildirdiniz, ya da vericiyə "
 "yetişilə bilmir."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Ünvan kitabçası açıla bilmədi"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP vericisinə anonim olaraq yetişmə"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Tanıdılma bacarılmadı.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s üçün şifrə daxil edin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "Təqvimin göstərəcəyi URI"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -345,7 +352,7 @@ msgstr "  Dəstəklənən Bazaları _Göstər "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -377,19 +384,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Ünvan Kitabçası Yaratma Bələdçisi"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Ünvan Kitabçası Xassələri"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Ünvan Kitabçası Mənbələri"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Ü_nvan Kitabçası Mənbələri..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Həmişə"
 
@@ -400,7 +410,8 @@ msgstr "Anonim olaraq"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -409,51 +420,51 @@ msgstr ""
 "Burada bildirdiyiniz mə'lumatları qeyd etməkk üçün xahiş edirik \"Qurtar\" "
 "düyməsinə basın."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Bağlanır"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Ayırılan _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Qurtardı"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Qrup:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Qətiyyən"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -463,30 +474,30 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Bir"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Axtarışın əhatə _sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Seçilən:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -497,7 +508,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -506,7 +517,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -514,38 +525,40 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
-msgstr ""
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
+msgstr "Təqvim qurğusundakı ilk addım göstəriləcək ad və qrupun seçilməsidir."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Addım 1: Qovluq Xassələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Addım 2: Verici Mə'lumatı"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Addım 3: Vericiyə Bağlanma"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Addım 4: Qovluqların Actarılması"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Alt"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -554,7 +567,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -562,7 +575,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -572,50 +585,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -623,28 +637,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS _işlət:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Ayırılan ad (DN) işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Epoçt ünvanı işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Mümkünsə Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -652,19 +666,19 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Göstərilən ad:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -673,39 +687,39 @@ msgstr "_Endirmə məhdudiyyəti:"
 msgid "_Edit"
 msgstr "_Düzəlt"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Giriş yöntəmi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Qapı nömrəsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Vaxt Dolması (dəqiqə):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "bağlanma-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "ümumi-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "axtarış-səkməsi"
 
@@ -820,7 +834,7 @@ msgstr "İş birliyi"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Əlaqə Editoru"
 
@@ -912,10 +926,10 @@ msgstr "_Kateqoriyalar..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -963,15 +977,15 @@ msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Ünvan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1955,103 +1969,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Məktub İsmarışı"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Xidmət"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Mövqe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "İstifadəçi adı"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Ev"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "İş"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Başqa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Mənbə Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Hədəf Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Əlaqə"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Yeni Əlaqə Mi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Yazıla Bilən Sahələr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Dəyişdirilib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Hesab Adı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kateqoriya editoru mövcud deyildir."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Əlaqəni VCard Olaraq Qeyd Et"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2059,7 +2081,7 @@ msgstr ""
 "Bu əlaqələri həqiqətən\n"
 "də silmək istəyirsiniz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2067,46 +2089,51 @@ msgstr ""
 "Bu əlaqəni həqiqətən\n"
 "də silmək istəyirsiniz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "İş"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Qrup"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Hamısını Düzəlt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Tam Ad:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_poçt:"
 
@@ -2262,11 +2289,11 @@ msgid "Is New List"
 msgstr "Yeni Siyahı Mı"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Siyahını VCard Olaraq Qeyd Et"
 
@@ -2355,13 +2382,13 @@ msgid "Email begins with"
 msgstr "Epoçt bununla başlayır:"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kateqoriya budur:"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Hər hansı bir sahə bunu daxil edir:"
 
@@ -2378,101 +2405,101 @@ msgid "Type"
 msgstr "Növ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Ünvan Dəftəri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Yeni Əlaqə..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Əlaqələri Axtar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Ü_nvan Kitabçası Mənbələri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Ötür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Ünvan kitabçası..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Ünvan kitabçası..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Köçür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Hazırkı Görünüş"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2481,8 +2508,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
@@ -2525,7 +2552,7 @@ msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Epoçt"
 
@@ -2584,7 +2611,7 @@ msgid "Nickname"
 msgstr "Ləqəb"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Qeyd"
 
@@ -2593,7 +2620,7 @@ msgid "Office"
 msgstr "İdarə"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Quruluş"
 
@@ -2719,67 +2746,73 @@ msgstr "Seçili"
 msgid "Has Cursor"
 msgstr "Kursora Malikdir"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Üzvləri Sırala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Epoçt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "İş"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "İzahat"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Qrup"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Video Görüşmə URL-si:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Şəxsi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Bloq"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Məslək"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Ev səhifəsi"
 
@@ -2788,8 +2821,8 @@ msgid "Success"
 msgstr "Müvəffəqiyyət"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2819,7 +2852,7 @@ msgstr "Protokol dəstəklənmir"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2839,7 +2872,8 @@ msgid "TLS not Available"
 msgstr "TLS Mövcud Deyil"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Ünvan kitabçası mövcud deyil"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -2974,7 +3008,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Ünvan Kitabçası Sorğulanır..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3029,17 +3064,40 @@ msgstr "Müəllif Hüququ (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Bu reflow canvas üzvünü sınayacaqdır"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm idxalçısı"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar ixdalçısı"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar ixdalçısı"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Əlaqələri çap et"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Əlaqəni çap et"
 
@@ -3131,7 +3189,7 @@ msgstr "Kənarlar"
 msgid "Number of columns:"
 msgstr "Sütun ədədi:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Seçimlər"
 
@@ -3307,8 +3365,8 @@ msgstr "Fayl adı bildirilməyib."
 msgid "Unnamed List"
 msgstr "Adsız Siyahı"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Şifrəni bildir"
 
@@ -3385,10 +3443,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Vəzifələr"
 
@@ -3432,26 +3489,26 @@ msgstr "Mürgüləmə vaxtı (dəqiqə)"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Aç"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Aç"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "_Nəzərə Ama"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "_Heç Birini Nəzərə Alma"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3464,12 +3521,12 @@ msgstr ""
 "Başlama %s\n"
 "Bitiş %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3481,7 +3538,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3498,19 +3555,19 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo hazırlana bilmədi"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs-ni başlada bilmədim"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
@@ -3646,24 +3703,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "İcmal bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "İzahat bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Şərh bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "İzahat bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Təqvim"
 
@@ -3692,7 +3755,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
@@ -3714,70 +3777,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Yeni Təqvim"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Yeni görüş yarat"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Yeni görüş istəyi yarat"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Yeni tam günlük görüş"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Tam Günlük Görüş"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Yeni tam günlük görüş yarat"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Yeni təqvim"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "_Təqvim"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Yeni təqvim yarat"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, 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:703
+#: calendar/gui/calendar-component.c:945
 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"
 
@@ -3909,7 +3972,7 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Gedişat/Hadisə"
 
@@ -3981,7 +4044,7 @@ msgid "hour(s)"
 msgstr "saat"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -3992,7 +4055,7 @@ msgstr "iclasın başlanğıcı"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Fəal"
 
@@ -4042,7 +4105,7 @@ msgstr "30 dəqiqə"
 msgid "60 minutes"
 msgstr "60 dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Bildirişlər"
 
@@ -4067,7 +4130,7 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Fəallaşdır"
 
@@ -4207,7 +4270,7 @@ msgid "_Fri"
 msgstr "_Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Ümumi"
 
@@ -4304,7 +4367,7 @@ msgstr ""
 "düyməsinə basın."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Yeni Vəzifə Siyahısı"
 
@@ -4454,23 +4517,23 @@ msgstr "%s  Siz dəyişikliklər aparmadınız, editor yenilənsin?"
 msgid "Validation error: %s"
 msgstr "Yoxlama xətası: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " alıcı "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Qurtarılıb "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Qurtarılıb "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Qalan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Qalan"
 
@@ -4506,8 +4569,8 @@ msgstr "Jurnal girişi - %s"
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Fərqli qeyd et..."
 
@@ -4533,10 +4596,21 @@ msgstr "Hədəf açıla bilmədi"
 msgid "Destination is read only"
 msgstr "Hədəf sırf oxunandır"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Hədəf mənbəni seç"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Təqvim"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Yeni vəzifə siyahısı"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4639,7 +4713,7 @@ 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:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Görüş"
 
@@ -4663,23 +4737,32 @@ msgstr "Vaxtlaşdırma"
 msgid "Meeting"
 msgstr "Görüş"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Bitiş tarixi başlama tarixindən əvvəldir!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Başlama tarixi səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Başlama vaxtı səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Bitiş vaxtı səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' təqvimi açıla bilmədi."
@@ -4755,29 +4838,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Seçili təşkilatçı artıq hesaba malik deyil."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Ən az bir iştirakçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
@@ -4968,7 +5051,7 @@ msgstr "tarixində"
 msgid "occurrences"
 msgstr "hadisələr"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Tarix/Saat"
 
@@ -5001,7 +5084,7 @@ msgid "_No recurrence"
 msgstr "Təkrarlama _yoxudr"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Çı_xart"
 
@@ -5043,7 +5126,7 @@ msgstr ""
 "\n"
 "Dəyişiklikləriniz qeyd edilsin?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "Dəyişiklikləri _Unut"
 
@@ -5067,7 +5150,7 @@ msgstr "Vəzifə tapşırma mə'lumatı yaradıldı. Göndərilsin?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Vəzifə tapşırma mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
@@ -5080,7 +5163,7 @@ msgstr "% _Bitdi"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Bitirilib"
 
@@ -5093,7 +5176,7 @@ msgstr "Yüksək"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Fəaliyyətdə"
 
@@ -5112,7 +5195,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Başlamayıb"
 
@@ -5151,16 +5234,16 @@ msgstr "Əsas"
 msgid "Assignment"
 msgstr "Tapşırıq"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Bitiş tarixi başlama tarixindən əvvəldir!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ünvan kitabçası açıla bilmədi"
@@ -5171,7 +5254,7 @@ msgstr "Gi_zli"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "İzahat:"
 
@@ -5355,11 +5438,10 @@ msgstr "Başlama Tarixi"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Mündəricat"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "rəng"
 
@@ -5384,7 +5466,7 @@ msgstr "N"
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5419,10 +5501,10 @@ msgstr "Xeyir"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Namə'lum"
@@ -5435,99 +5517,105 @@ msgstr "Təkrarlanan"
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Seçili üzvlər silinir"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Üzvlər yenilənir"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Günlük _Hadisə"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Yeni Görüş"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "Ç_ap et..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını _Dərc Et"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Aç"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Köçür"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Görüş Planlaşdır..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar şəklində ö_tür..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqiəni Sil"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqiələri Sil"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Qurğular..."
 
@@ -5614,7 +5702,7 @@ msgid "Alarms"
 msgstr "Alarmlar"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Bitdi"
 
@@ -5672,26 +5760,26 @@ msgstr "%02i dəqiqəlik bölmələr"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5874,7 +5962,7 @@ msgid "Send Latest Information"
 msgstr "Ən Son Mə'lumatı Yolla"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
@@ -6328,12 +6416,12 @@ msgstr "Vaciblik:"
 msgid "Web Page:"
 msgstr "Veb Səhifəsi:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ünvanını açmaq üçün tıqlayın"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6343,7 +6431,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6354,12 +6442,12 @@ msgstr ""
 "vəzifə arxa ara üzü\n"
 " iflas etdi."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtı açılır"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6368,28 +6456,38 @@ msgstr ""
 "%s açılırkən xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Vəzifələr başa çatdırılır..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Seçili cismlər silinir..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Geri alma"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Vəzifələrin yüklənməsi"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Görüş - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılması"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6511,16 +6609,16 @@ msgstr "Sərbəst/Məşğul mə'lumatı (%s / %s)"
 msgid "iCalendar information"
 msgstr "iCalendar mə'lumatı"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s üçün şifrəni bildir"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6532,7 +6630,7 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6544,12 +6642,12 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Ad Günləri & Bayramlar"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Vebdə"
 
@@ -6738,49 +6836,49 @@ msgstr "Seçili ay (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Seçili il (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Vəzifə"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Vəziyyət: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Vaciblik: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Başa Çatmış Nisbət: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kateqoriyalar: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Əlaqələr: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Çap Nümayişi"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Üzvü Çap Et"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
@@ -6789,36 +6887,36 @@ msgstr "Çap Qurğuları"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Yeni vəzifə yarat"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Yeni vəzifə siyahısı"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Vəzifə Siyahısı"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Yeni vəzifə siyahısı yarat"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6875,20 +6973,20 @@ msgstr "iCalendar faylları (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar faylları (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Görüş və hadisələri daxil edən ictimai qovluq"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Xatırladıcı!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Təqvim Hadisələri"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6896,7 +6994,7 @@ msgstr ""
 "Evolution Gnome Təqvim fayllarını tapdı.\n"
 "Onları Evolution-a idxal etmək istəyirsiniz?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Təqvim"
 
@@ -8558,7 +8656,7 @@ msgstr "İsmarış açıla bilmir"
 msgid "Failed on message %d"
 msgstr "%d ismarışında xəta yarandı"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Qovluq sinxronlaşdırılır"
 
@@ -8643,7 +8741,7 @@ msgstr "İsmarışlar köçürülür"
 msgid "Filtering new message(s)"
 msgstr "Yeni ismarış(lar) süzülür"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8654,15 +8752,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid bildirişi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg şifrə istəyi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8671,30 +8769,26 @@ 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:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Ləğv edildi."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, 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:814
-msgid "No data provided"
-msgstr "Heç bir mə'lumat bildirilməyib"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 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:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8705,61 +8799,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, 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:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg icra edilə bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "gpg icra edilə bilmədi."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Məktub məzmununu indekslə"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Editordan ismarış alına bilmir"
@@ -8872,21 +8966,34 @@ msgstr "MIME hissəsinin şifrəsi açıla bilmədi: hökmsüz qurğu"
 msgid "parse error"
 msgstr "oxuma xətası"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Virtual qovluq epoçt xidmətçisi"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Başqa qovluq dəstələrinin istəyi olaraq məktubların oxunması üçün"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s yüklənə bilmədi: Modul yükləməsi bu sistemdə dəstəklənmir."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklənə bilmədi: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklənə bilmədi: Modulda başlatma kodu yoxdur."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "`%s' protokolu üçün xidmətçi yoxdur"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonim"
@@ -9035,7 +9142,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtmacavabı alındı."
 
@@ -9168,20 +9275,7 @@ msgstr "Qovşaq axtarışı iflas etdi: qovşaq tapılmadı"
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq axtarışı iflas etdi: namə'lum səbəb"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Virtual qovluq epoçt xidmətçisi"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Başqa qovluq dəstələrinin istəyi olaraq məktubların oxunması üçün"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "`%s' protokolu üçün xidmətçi yoxdur"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9251,21 +9345,25 @@ msgstr "Verici: %s, Növ: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alına bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Zibil"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9498,21 +9596,31 @@ msgstr "%s içində %s bənzəri ismarış yoxdur"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, 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:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9528,16 +9636,11 @@ 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"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Ünvan Dəftəri"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9557,42 +9660,40 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Şifrə"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Bu seçim IMAP vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Ön qurğulu"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "siyahı"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9601,26 +9702,26 @@ msgstr ""
 "%s@%s IMAP vericisindən xəbərdarlıq:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz cavab: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP vericisinin cavabı %s mə'lumatını daxil etmədi"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz qəbul cavabı: %s"
@@ -9635,7 +9736,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yenisi yaradıldı."
 
@@ -9644,12 +9745,12 @@ msgstr "Qovluq dağıdılıb vericidə yenisi yaradıldı."
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışlar axtarılır"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İsmarış alına bilmədi: %s."
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9665,25 +9766,25 @@ msgstr ""
 "İsmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcud deyil"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 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:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -9741,27 +9842,37 @@ msgstr "Ad boşluğu"
 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"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Bütün qovluqlarda yeni poçtu yoxla"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Bütün qovluqlarda yeni poçtu yoxla"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP vericisi"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, 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:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9770,65 +9881,65 @@ msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Şifrənizi bildirmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9839,24 +9950,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "%s adında qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün hökmsüzdür"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Namə'lum qonşu qovluq: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Qonşu qovluq alt qovluqlara malik ola bilməzi"
 
@@ -9878,7 +9997,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s POP vericisinə bağlana bilmədi"
@@ -9957,8 +10076,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9970,55 +10089,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, 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:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "`%s' qovluq mündəricat faylı silinə bilmədi: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "İcmal qeyd edilə bilmədi: %s :%s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Mündəricata ismarış əlavə edilə bilmədi: namə'lum səbəb"
 
@@ -10036,53 +10155,44 @@ msgstr "İsmarış maildir qovluğuna əlavə edilə bilmir: %s: %s "
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış məzmunu"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"`%s' qovluğu açıla bilmədi: \n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' qovluğu mövcud deyil."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"`%s' qovluğu yaradıla bilmədi:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' maildir qovluğu deyil."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmədi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "maildir qovluğu deyil"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10104,9 +10214,9 @@ msgid "Checking for new messages"
 msgstr "Yeni ismarışlar yoxlanır"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Qovluq saxlanır"
@@ -10150,159 +10260,137 @@ msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İsmarış quruluşu bacarılmadı: Məktub qutusu xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"`%s' faylı açıla bilmədi:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Bu adda qovluq yaradıla bilmir"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"%s qovluğu yaradıla bilmədi:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "%s faylı ilişdirilə bilmir: sıravı fayl deyil"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"`%s' faylı yaradıla bilmədi: \n"
+"`%s' qovluğu silinə bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal fayl deyil."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"`%s' qovluğu silinə bilmədi:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyil. Silinmədi."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Bu adda qovluq yaradıla bilmir"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "%s qovluğu yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Qovluq açıla bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yeri yaxınlığında %s qovluğunda ciddi məktub oxuma xətası"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Qovluq yoxlana bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Fayl açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Mənbə qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "İcmal və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra belə"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Namə'lum xəta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Qovluq saxlana bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Müvəqqəti məktub qutusuna yazma xətası: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Müvəqqəti məktub qutusuna yazma bacarılmadı: %s: %s"
@@ -10316,10 +10404,17 @@ msgstr "MH ismarış əlavəsi ləğv edildi"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "İsmarış mh qovluğuna əlavə edilə bilmir: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"`%s' qovluğu yaradıla bilmədi:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' qovluq deyil."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Qovluq alına bilmir: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10341,6 +10436,29 @@ msgstr "`%s' hovuzu normal fayl ya da qovluq deyil"
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' qovluğu mövcud deyil."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"`%s' qovluğu açıla bilmədi: \n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "`%s' qovluğu mövcud deyil."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"`%s' qovluğu yaradıla bilmədi:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10580,47 +10698,47 @@ msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Namə'lum xəta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Belə qovluq yoxdur: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Qrup alına bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "İsmarış göndərilə bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP əmri iflas etdi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Yeni ismarışlaryoxlanır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Naməlum verici cavabı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Ləğv etməni işlət"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Əməliyyat bacarılmadı: %s"
@@ -10667,7 +10785,7 @@ msgstr "%s gün sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bütün POP3 uzantı dəstəklərini qeyri-fəallaşdır"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10756,7 +10874,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10810,7 +10928,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10977,7 +11095,7 @@ msgstr "%s vasitəsilə SMTP məktub göndərilməsi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
@@ -11083,34 +11201,34 @@ msgstr "QUIT istəyi vaxt dolması: %s"
 msgid "QUIT response error"
 msgstr "QUIT cavablama xətası"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "ilişdirilmiş fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri ilişdirilmiş fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "İlişdirilmiş fayl əlavə et..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl ilişdir"
 
@@ -11228,19 +11346,19 @@ msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 msgid "Attach file(s)"
 msgstr "Fayl(lar) ilişdir"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11249,30 +11367,30 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazılsın?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Faylı qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Faylı yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarış alına bilmir"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11281,7 +11399,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11290,7 +11408,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11299,7 +11417,7 @@ msgstr ""
 "Fayl izahatçısı köçürülə bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11308,7 +11426,7 @@ msgstr ""
 "İsmarışın avtomatik qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11317,7 +11435,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etmək istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11328,43 +11446,43 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmək istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Diqqət: Təkmilləşdirilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "İmza:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Avtomatik yarat"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "İsmarış yaz"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11372,7 +11490,7 @@ 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:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11384,7 +11502,7 @@ msgstr ""
 "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:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11392,7 +11510,7 @@ 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:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11738,7 +11856,7 @@ msgstr "Onda"
 msgid "You must specify a folder."
 msgstr "Qovluq bildirməlisiniz."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Qovluğu Seç"
@@ -11753,19 +11871,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Vacib"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Ediləcəklər"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Sonra"
 
@@ -11853,7 +11971,7 @@ msgstr ""
 "Bu ismarışın tarixi filtrin işlədiyi vaxt\n"
 "hazırkı tarix ilə müqayisə ediləcəkdir."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtual Qovluqlar"
 
@@ -11869,7 +11987,7 @@ msgstr "əvvəl"
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "saniyə"
 
@@ -12039,7 +12157,7 @@ msgstr "Bayraqlı deyilsə"
 msgid "Junk Test"
 msgstr "İyun"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12147,9 +12265,10 @@ msgstr "bununla başlayırsa:"
 msgid "Stop Processing"
 msgstr "Oxumağı Dayandır"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Mövzu"
 
@@ -12157,25 +12276,25 @@ msgstr "Mövzu"
 msgid "Unset Status"
 msgstr "Vəziyyəti Geri Al"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "'%s' qayda adı xas olmalıdır, başqasını seçin."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Qaydalar"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Qaydanı Dəyişdir"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Qayda adı"
 
@@ -12215,15 +12334,15 @@ msgstr "Mövzu bunu daxil etsin"
 msgid "Subject does not contain"
 msgstr "Mövzu bunu daxil etməsin"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Bu vqovluğa ad verməlisiniz."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "VQolvuq mənbəsi"
 
@@ -12272,9 +12391,9 @@ msgstr "Evolutionun Məktub qovluğu nümayişcisi"
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Məktub"
 
@@ -12282,7 +12401,7 @@ msgstr "Məktub"
 msgid "Mail Accounts"
 msgstr "Poçt Hesabları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12320,15 +12439,15 @@ msgstr "Hökmlü skript adı bildirməlisiniz."
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Dil(lər)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Skript imzası əlavə et"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
@@ -12415,7 +12534,6 @@ msgid "Unread messages"
 msgstr "_Sonrakı Oxunmamış İsmarış"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
@@ -12423,395 +12541,414 @@ msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 msgid "Create New Folder"
 msgstr "Yeni Qovluq Yarat"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Qovluq _adı:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VQovluqlar"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Gələnlər qutusu"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Yüklənir..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni qovluq yarat"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "`%s' qovluğu silinə bilmədi: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"-i Sil"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Qovluğu Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pəncərədə Aç"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Daşı"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Yeni Qovluq..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Xassələr..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Yaz"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Yaz"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Yaz"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Ö_tür"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "_Bitirilmiş olaraq işarələ"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Sil"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq işarələ"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçür..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Filtrləri _Tətbiq Et"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "_Mövzuya görə VQovluğa"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara görə VQovluğa"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma _Qrupuna görə VQovluğa"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "_Mövzuya görə filtrlə"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "_Göndərənə görə filtrlə"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıya görə filtrlə"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupuna görə filtrlə"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "_Göndərənə görə filtrlə"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Ön qurğulu"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Körpü Ünvanını Köçür"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Nəticələr:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Vəzifələndirilmiş"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
 "bilmir."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "İmzanı dəyişdir"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
+"Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
+"bilmir."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "İmzanı qeyd et"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Kəsildi"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP Şifrələməsi"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifikat hələ hökmlü deyil"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, 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:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Gecikmiş işlər:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Daxili Olaraq Göstər"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Gizlə"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Səhifə: %d (Cəmi %d)"
@@ -12855,29 +12992,34 @@ msgstr "Namə'lum xarici mə'lumatı göstərən ox (\"%s\" növündə)"
 msgid "Formatting message"
 msgstr "İsmarışlar daşınır"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Göndərici"
 
@@ -12891,8 +13033,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -12910,21 +13052,26 @@ msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Dəstəklənməyən sxem"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12936,60 +13083,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "%s ön yaddaşa alına bilmədi: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "%s ön yaddaşa alına bilmədi: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "`%s' qovşağı tapıla bilmədi: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Save As..."
 msgstr "_Fərqli Qeyd Et..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Adsız İsmarış"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "Göndərənə _cavab yaz"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Qrupa _ismarış göndər..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ilə aç..."
@@ -13039,18 +13186,18 @@ msgstr "Filtrlər"
 msgid "-------- Forwarded Message --------"
 msgstr "Ötürülmüş İsmarış"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13059,7 +13206,7 @@ msgstr ""
 "`%s' mövqeyinə qeyd edilə bilmir\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13068,32 +13215,38 @@ msgstr ""
 "%s onsuz da mövcuddur.\n"
 "Üstünə yazılsın?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "İsmarış"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Ünvan"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "%s-dan məktub"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13106,7 +13259,7 @@ msgstr ""
 "\n"
 "Bu ismarışlar həqiqətən də silinsin?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13132,211 +13285,225 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "İsmarışın ön qurğulu mövzusu."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "İsmarışın ön qurğulu mövzusu."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Göstərilən ismarışın məzmununda mətni axtar"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Göstərilən ismarışın məzmununda mətni axtar"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Ötürmə _tərzi:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "İsmarışın ön qurğulu mövzusu."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "İsmarışın ön qurğulu mövzusu."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Cavab _tərzi:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Poçt Hesabları"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Gedişatı işə sal"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13345,108 +13512,102 @@ 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "HTML Məktubu Göndərilsin?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "HTML Məktubu Göndərilsin?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "İsmarışı normal tərzdə göstər"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Nümayiş Paneli"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Yeni məktub alındığında _səs çal"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "İmla _Yoxlaması"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminal Yazı Növü:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Çap üçün HTML dəyişən yazı növünü seç"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13454,172 +13615,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "İlgəklənmiş İsmarış Siyahısı"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "İlgəklənmiş İsmarış Siyahısı"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Bu hesabı ön _qurğulu hesabım et"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Dəyişən-en:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "İdxal Et"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox idxalçısı"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine idxalçısı"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "İdxal edilir..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s, %s olaraq idxal edilir"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s oxunur"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Fayllar İdxal Edilir"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13627,16 +13785,44 @@ msgstr ""
 "Evolution Elm məktub faylları tapdı.\n"
 "Onları Evolution içinə idxal etmək istəyirsiniz?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Hədəf sırf oxunandır"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "İdxal edilir"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Fayllar İdxal Edilir"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "%s oxunur"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Əsas Filtr \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13651,7 +13837,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13659,7 +13845,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13668,31 +13854,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Məktub filtrləri oxunur"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Qovluq oxunur"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "İdxal başlanır"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Qurğular"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Poçt Filtrləri"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13700,11 +13879,20 @@ msgstr ""
 "Evolution Netscape  məktub faylları tapdı.\n"
 "Onları Evolution içinə idxal edək?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution köhnə Pine verilənlərini idxal edir"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Fayllar İdxal Edilir"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Ünvan Dəftəri"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13712,7 +13900,7 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13755,19 +13943,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Lazımi bütün mə'lumatlar verilməlidir."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Editoru"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_İstifadəçi adı:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Cığır:"
 
@@ -13819,28 +14007,43 @@ msgstr ""
 "    '%s'\n"
 "O yeniləndi."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Yeni məktub ismarışı yaz"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Yeni VQovluq"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Poçt Filtrləri"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Yeni təqvim yarat"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Təqvimin göstərəcəyi URI"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Şəxsiyyət"
 
@@ -13875,7 +14078,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
@@ -13897,123 +14100,118 @@ msgid "Connecting to server..."
 msgstr "Vericiyə bağlanır..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Şifrələnmiş məktub göndərildiyi vaxt məktubu _həmişə mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Hesab Editoru"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Hesab Mə'lumatı"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "S_kript Əlavə Et"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Yeni imza əlavə et..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Şifrələnmiş məktub göndərildiyi vaxt məktubu həmişə _mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Bu ünvana həmişə məktubun _gizli nüsxəsini (Bcc) yolla:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Bu ünvana həmişə məktubun _nüsxəsini (Cc) yolla:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Şifrələrkən açar dairəmdəki açarlara _həmişə e'tibar et"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Orijinal ismarışı ilişdir"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "İlişdirilmiş fayl"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Hərf dəstəsi:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Rənglər"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Yeni Məktubların Yoxlanması"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Yazdığımda imlanı _yoxla"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Yeni Məktubların Yoxlanması"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Səhv imlalı mətnin _rəngi:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "İsmarışların Yazılması"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14029,311 +14227,307 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tətbiq Et\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Ön _qurğulu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Ön Qurğulu Davranış"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Ön qurğulu hərf _kodlaması:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Poçtun Silinməsi"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Orijinal ismarışı sitatlama"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Görüş istəklərini _imzalama (Outlook ilə uyğunluq üçün)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Başa çatdı"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Layihələr qovluğu:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Epoçt Hesabları"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_Epoçt ünvanı:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Bələdçisi"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Əmr İcra Et..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Tən-aralıqlı en:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Filtrlər"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Yazı Növü Qurğuları"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "İsmarışları _HTML olaraq şəkilləndir"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Başlıq"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _işıqlandır:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Daxili"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiket və Rənglər"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Rəsmlərin Yüklənməsi"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Poçt Qurğuları"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Məktub qutusu mövqeyi"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "İsmarış Tərtib Edicisi"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "İsmarış Görünüşü"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "İsmarış Yazı Növləri"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Qeyd: İlk dəfə bağlanana dək sizdən şifrənizi daxil etməniz istənəcəkdir"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Açar ID-si:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Rəng seç"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Çap Edilən Yazı Növləri"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail poçt qovluğu"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Orijinal ismarışı sitatlandır"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Cavablama-Ünvanı:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Alınma _Seçimləri"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Lazımi Mə'lumat"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Ön Qurğulara Geri Dön"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "E'tibarlı MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Çap üçün HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Çap üçün HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Layihə İsmarışları"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmanı məcbur qılır"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Verici Qurğuları"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Fayl adı _bildir:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "İmla _Yoxlaması"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Dəyişən-en:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14343,176 +14537,176 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_İmza Əlavə Et"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Netdən rəsmləri həmişə yüklə"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Tanıtma Növü: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Tanıtma növü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Emosiya rəsmlərini avtomatik olaraq _daxil et"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Yeni məktub alındığında _bip səsi çıxart"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Qovluq həmişəlik silinirkən _təsdiq istə"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Ön qurğulu _imza:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Ö_n qurğular"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni məktub alındığında bildirmə"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Fəallaşdır"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Ötürmə _tərzi:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Tam ad:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML Məktub"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "Şə_xsiyyət"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "İyun"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Yollayan ünvan kitabçasında varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Bu hesabı ön _qurğulu hesabım et"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "İsmarışları oxunmuş olaraq işarələmə _vaxtı:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Netdən rəsmləri _qətiyyən endirmə"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Yeni məktub alındığında _səs çal"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
 "istə"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzulu məktub göndərdiyimdə təsdiq istə"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "Poçt _Alınması"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Cavab _tərzi:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Ön qurğulara geri _dön"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Sil..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Poçtun _Göndərilməsi"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_İmzalar"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standart Yazı Növü:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminal Yazı Növü:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_E'tibarlı bağlantı (SSL) işlət:"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Diqər proqramların işlətdiyi yazı növlərini işlət"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "izahat"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pinglənir"
@@ -14535,7 +14729,7 @@ msgstr ""
 "Əməliyyat aparılırkən xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "İşləyir"
 
@@ -14547,12 +14741,12 @@ msgstr "Qovluq Filtrdən Keçirilir"
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14561,116 +14755,116 @@ 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:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" göndərilir"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d / %d ismarışında xəta baş verdi"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Başa çatdı."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"dakı qovluqlar oxunur"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Ötürülmüş ismarışlar"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "%s mənbəsi açılır"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Qovluq silinir"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' içindəki zibil boşaldılır"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14679,7 +14873,7 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14688,11 +14882,11 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "İlişdirilmiş fayl qeyd edilir"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14701,22 +14895,22 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14752,38 +14946,38 @@ msgstr "Xaric Tutulanlar"
 msgid "Security Information"
 msgstr "Hesab Mə'lumatı"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Ləğv edilir..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Verici: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cığır: %s, Növ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Növ: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Məktub Göndər & Al"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Hamısını_ Ləğv Et"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Yenilənir..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
@@ -14892,20 +15086,20 @@ msgstr ""
 "    '%1$s'\n"
 "Onlar yeniləndilər."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vQovluqlar"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "VQovluğu Dəyişdir"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vqovluğu dəyişdirilməyə çalışılır."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Yeni VQovluq"
 
@@ -15232,99 +15426,20 @@ msgstr "Xətdən Qopuq Cərgələr"
 msgid "Autocompletion Folders"
 msgstr "Avtomatik Tamamlama Qovluqları"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Qovluq köçürülə bilmir: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"Qovluq daşına bilmir:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Qovluq öz üstünə daşına bilməz."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Qovluq öz üstünə köçürülə bilməz."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "\"%s\" qovluğunun köçürələcəyi qovluğu bildir:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Qovluğu Köçür"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "\"%s\" qovluğunun daşınacağı qovluğu bildir:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Qovluğu Daşı"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Qovluq silinə bilmir:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Qovluaq adı dəyişdirilə bilmir:\n"
+"Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Qovluaq silinə bilmir:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Bildirilən qovluq yaradıla bilmədi:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "( Adsız )"
@@ -15465,7 +15580,7 @@ msgstr "gpg icra edilə bilmədi."
 msgid "_Import"
 msgstr "İdxal Et"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Bağlantılar bağlanır..."
 
@@ -15503,6 +15618,10 @@ msgstr "Bölüşülmüş qovluq açıla bilmir: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Bildirilən bölüşülmüş qovluq tapıla bilmir"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "İdxal başlanır"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15610,123 +15729,6 @@ msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Yeni Qısa Yol Qrupu Yarat"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Qrup adı:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Həqiqətən də \"%s\" qrupunu qısa yol çubuğundan silmək istəyirsiniz?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Seçili qısa yol qrupunun adını bununla dəyişdir:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Kiçik Timsallar"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Qısa yolları kiçik timsallar olaraq göstər"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Böyük Timsallar"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Qısa yolları böyük timsallar olaraq göstər"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "Qrup Ə_lavə Et..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Yeni qısa yol qrupu yarat"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Bu Qrupu _Sil..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Bu qısa yol qrupunu sil"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Bu Qrupu _Yenidən Adlandır..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Bu qısa yol qrupunu yenidən adlandır"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Vəziyyət Çubuğunu _Gizlə"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Vəziyyət çubuğunu gizlə"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Ön _Qurğulu Qısa Yolları Yarat"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Ön Qurğulu Qısa Yolları Yarat"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Qısa Yolu Yenidən Adlandır"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Bu qısa yolun adını bununla dəyişdir:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Bu qısa yola bağlanmış qovluğu aç"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Yeni _Pəncərədə Aç"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Bu qısa yol ilə bağlanmış qovluğu yeni pəncərədə aç"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Bu qısa yolu yenidən adlandır"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Sil"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Bu qısa yolu qısa yol çubuğundan sil"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Qısa yolları qeyd edərkən xəta."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Qısa yollar"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "İşarələmə qutusu"
@@ -15737,11 +15739,6 @@ msgstr "İşarələmə qutusu"
 msgid "New"
 msgstr "Yeni"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%2$s\" içində \"%1$s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16023,59 +16020,59 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "İdxalçı seçin"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "İrəliləmə"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "İfadə"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-Poçt Ünvanını Birləşdir"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Sertifikatın vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "%s üçün şifrəni bildirin"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16144,7 +16141,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Sertifikat ID-si:"
@@ -16219,11 +16216,11 @@ msgstr "Quruluş Bölümü"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16272,239 +16269,239 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "Oldu"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Sertifikat Ləğv Edildi"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifikat e'tibarlı deyil"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Mövzu %s-dır"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Növbə qovluğu həll edilə bilmədi"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Mə'lumat Yoxdur"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "ilişdirilmiş fayl"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Sertifikat imzası xətası"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "İfadə"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikat imzası xətası"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Daxil Et"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Mövzu %s-dır"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sertifikat imzası xətası"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "%s üçün şifrəni bildirin"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Sertifikat ID-si:"
@@ -17102,7 +17099,8 @@ msgid "_Threaded Message List"
 msgstr "İlgək_lənmiş İsmarış Siyahısı"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Yollayanı Ünvan Kitabçasına Ə_lavə Et"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17110,7 +17108,8 @@ msgid "A_pply Filters"
 msgstr "Filtrlər _Tətbiq Et"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17563,10 +17562,6 @@ msgstr "Şə_kil"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Aç"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Fayl aç"
@@ -17936,22 +17931,6 @@ msgstr "_Göndər / Al"
 msgid "_Window"
 msgstr "İndi _Tap"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "İcmalı Çap Et"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Çap icmalı"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Yenilə"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Nümayişi yenilə"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Ş_irkətə Görə"
@@ -18018,8 +17997,8 @@ msgstr "_Kateqoriya İlə"
 msgid "_Tasks"
 msgstr "_Vəzifələr"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18266,23 +18245,23 @@ msgstr "A_xtar"
 msgid "_Find Now"
 msgstr "İndi _Tap"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Təmizlə"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Üzv ID-si"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Alt üzv-si ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Mətn"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Axtar"
@@ -18297,6 +18276,206 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 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"
+#~ msgstr ""
+#~ "`%s' faylı açıla bilmədi:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s qovluğu yaradıla bilmədi:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "`%s' faylı yaradıla bilmədi: \n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' qovluq deyil."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "%s, %s olaraq idxal edilir"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Məktub filtrləri oxunur"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Qovluq oxunur"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Qovluq köçürülə bilmir: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr ""
+#~ "Qovluq daşına bilmir:\n"
+#~ "%s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Qovluq öz üstünə daşına bilməz."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Qovluq öz üstünə köçürülə bilməz."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "\"%s\" qovluğunun köçürələcəyi qovluğu bildir:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Qovluğu Köçür"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "\"%s\" qovluğunun daşınacağı qovluğu bildir:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Qovluğu Daşı"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Qovluq silinə bilmir:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Qovluaq adı dəyişdirilə bilmir:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Qovluaq silinə bilmir:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Yeni Qısa Yol Qrupu Yarat"
+
+#~ msgid "Group name:"
+#~ msgstr "Qrup adı:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Həqiqətən də \"%s\" qrupunu qısa yol çubuğundan silmək istəyirsiniz?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Seçili qısa yol qrupunun adını bununla dəyişdir:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Kiçik Timsallar"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Qısa yolları kiçik timsallar olaraq göstər"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Böyük Timsallar"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Qısa yolları böyük timsallar olaraq göstər"
+
+#~ msgid "_Add Group..."
+#~ msgstr "Qrup Ə_lavə Et..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Yeni qısa yol qrupu yarat"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Bu Qrupu _Sil..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Bu qısa yol qrupunu sil"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Bu Qrupu _Yenidən Adlandır..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Bu qısa yol qrupunu yenidən adlandır"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Vəziyyət Çubuğunu _Gizlə"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Vəziyyət çubuğunu gizlə"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Ön _Qurğulu Qısa Yolları Yarat"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Ön Qurğulu Qısa Yolları Yarat"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Qısa Yolu Yenidən Adlandır"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Bu qısa yolun adını bununla dəyişdir:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Bu qısa yola bağlanmış qovluğu aç"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Yeni _Pəncərədə Aç"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Bu qısa yol ilə bağlanmış qovluğu yeni pəncərədə aç"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Bu qısa yolu yenidən adlandır"
+
+#~ msgid "Re_move"
+#~ msgstr "_Sil"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Bu qısa yolu qısa yol çubuğundan sil"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Qısa yolları qeyd edərkən xəta."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Qısa yollar"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%2$s\" içində \"%1$s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "İcmalı Çap Et"
+
+#~ msgid "Print summary"
+#~ msgstr "Çap icmalı"
+
+#~ msgid "Reload"
+#~ msgstr "Yenilə"
+
+#~ msgid "Reload the view"
+#~ msgstr "Nümayişi yenilə"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Qovluğa köçür..."
 
diff --git a/po/be.po b/po/be.po
index 7765310e6b..2a1ef1a630 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -49,8 +49,7 @@ msgstr "Наладка вашых уліковых запісаў пошты р�
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Кантакты"
 
@@ -91,20 +90,20 @@ msgstr "Сродак кіраваньня наладкамі тэчак \"Эва
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -112,67 +111,67 @@ msgstr "Кніга адрэсаў"
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Уласьцівасьці..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Новы кантакт:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Кантакт"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Стварыць новы кантакт"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Новы сьпіс кантактаў"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Новы сьпіс кантактаў"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Стварыць новы сьпіс кантактаў"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Збой далучэньня да паслужніка LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Збой аўтарызацыі на паслужніку LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Немагчыма выканаць запыт да карэннага DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Памылка атрыманьня зьвестак схемы"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Чаканьне..."
@@ -186,42 +185,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Зандаваньне %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Пэрсанальнае"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Паслужнік LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Паслужнік LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Тэчкі аўтазавяршэньня"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -234,7 +235,7 @@ msgstr ""
 "ці абмяжуйце памер адказу кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -246,19 +247,19 @@ msgstr ""
 "пошук ці зьмяніце абмежаваньне часу для гэтае кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Праграма гэтае кнігі адрэсаў ня здолела разабраць запыт."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Праграма гэтае кнігі адрэсаў адмовіла ў запыце."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Запыт ня быў пасьпяхова выкананы."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -267,7 +268,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Праверце, што шлях існуе\n"
 "і што у вас ёсьць неабходныя правы доступа."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -276,7 +277,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -288,7 +289,7 @@ msgstr ""
 "перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
 "усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -297,28 +298,33 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік не адказвае."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Далучацца да паслужніка LDAP ананімна"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Збой аўтарызацыі.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, які будзе адлюстроўваць каляндар"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -362,7 +368,7 @@ msgstr "  _Адлюстраваць базы, якія падтрымліваю�
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -395,20 +401,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Дапаможнік наладкі LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Крыніцы кнігаў адрэсаў..."
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Крыніцы кнігаў адрэсаў..."
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Крыніцы кнігі адрэсаў..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Заўсёды"
 
@@ -419,7 +426,8 @@ msgstr "Ананімна"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -429,54 +437,54 @@ msgstr ""
 "Калі ласка, клікніце кнопку \"Завершыць\", каб захаваць парамэтры\n"
 "пазначаныя тутака."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Далучэньне"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Удакладнёная назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтае DN для аўтарызацыі на паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтую адрэсу для аўтарызацыі вас на "
 "паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Скончана"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Асноўнае"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Ніколі"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -491,23 +499,23 @@ msgstr ""
 "вашага злучэньня. Спытайце вашага сыстэмнага адміністратара,які пратакол \n"
 "падтрымлівае ваш паслужнік LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Адзін"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Межы _пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Выбранае:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -517,7 +525,7 @@ msgstr ""
 "паслужніка\n"
 "LDAP калі той падтрымлівае SSL ці TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -535,7 +543,7 @@ msgstr ""
 "пакуль вашае злучэньне\n"
 "бясьпечнае."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -549,7 +557,7 @@ msgstr ""
 "нетрывалым  да эксплойдаў\n"
 "бясьпекі. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -560,43 +568,44 @@ msgstr ""
 "на паслужніку LDAP,\n"
 "і сварэньня і рэдагаваньня кантактаў. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Пазначае назву якая была вызначана на апошнім кроку наладкі паслужніка LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Крок 1: Зьвесті паслужніка"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Крок 2 : Далучэньне да паслужніка"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Крок 3: Пошук каталёга"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Пад"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Базы пошуку, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -609,7 +618,7 @@ msgstr ""
 "адміністратара,\n"
 "калі вам патрэбна зьмяніць гэтыя опцыі."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -620,7 +629,7 @@ msgstr ""
 "ваш пошук. Калі вы пакініце гэтае поле пустым, пошук будзе пачаты з карэня \n"
 "дрэва каталёгаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -636,12 +645,13 @@ msgstr ""
 "узровень\n"
 " за базу пошуку.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -652,23 +662,24 @@ msgstr ""
 "спэцыялізаваную інфармацыю аб паслужніку. Калі ласка,\n"
 "зьвяжыцеся з вашым адміністратарам каб атрымаць яе."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Гэта максымальная колькасьць запісаў для загрузкі. Усталяваньне  гэтае \n"
 "лічбы ў вялікае значэньне запаволіць вашую кнігу адрэсаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -678,7 +689,7 @@ msgstr ""
 "Усталёўка значэньня у \"Адрэса пошты\"прадастаўляе ананімны доступ да вашага "
 "паслужніка LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -687,7 +698,7 @@ msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -697,7 +708,7 @@ msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -708,28 +719,28 @@ msgstr ""
 "далучэньня. Запытайцеся вашага адміністратара каб даведацца які \n"
 "порт выкарыстоўвае ваш паслужнік."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Гэтая можнасьць кантралюе працягласьць пошуку."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Вы_карыстоўваць SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Выкарыстоўваць удакладнёнаю назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Выкарыстоўваць паштовую адрэсу"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Калі магчыма"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -742,19 +753,19 @@ msgstr ""
 "Калі ласка, запытайцеся, вашага сыстэмнага адміністратара, калі вы няпэўныя "
 "у гэтых зьвестках."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Назва для адлюстраваньня:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -763,39 +774,39 @@ msgstr "Аб_межаваньне загрузкі:"
 msgid "_Edit"
 msgstr "_Рэдагаваньне"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Мэтад уваходу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Нумар порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Назва паслужніка:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Таймаут (хвіліны):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "карткі"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "закладка далучэньня"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "агульная закладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "закладка пошуку"
 
@@ -918,7 +929,7 @@ msgstr "Супрацоўніцтва"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Рэдактар кантактаў"
 
@@ -1015,10 +1026,10 @@ msgstr "_Катэгорыі..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1066,15 +1077,15 @@ msgid "_Web page address:"
 msgstr "Адрэса Web-старонкі:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Адрэса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2069,109 +2080,117 @@ msgid "AOL Instant Messenger"
 msgstr "_Даслаць паведамленьне"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Сьпіс бяз назвы"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Паштовае паведамленьне"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Паслуга гатова"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Мейсца:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Імя карыстальніка:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Хатні"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Праца"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Іншы"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Крыніца"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новы кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Палі у якія можна пісаць"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Зьменена"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Назва уліковага запіса"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Адсутнічае катэгорыя рэдактара."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Гэты кантакт належыць наступным катэгорыям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Захаваць кантакт як візытоўку (VCard)"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2179,7 +2198,7 @@ msgstr ""
 "Вы ўпэўненыя што жадаеце\n"
 "выдаліць гэтыя кантакты?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2187,47 +2206,52 @@ msgstr ""
 "Вы ўпэўненыя што жадаеце\n"
 "выдаліць гэты кантакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Працоўны"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Ёра"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Група"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Неатрымалася адшукаць віджэт для поля: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Хуткае даданьне кантакта"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "Рэдагаваньне поўнага імя"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Поўнае імя:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "Э. пошта:"
 
@@ -2386,11 +2410,11 @@ msgid "Is New List"
 msgstr "Гэта новы сьпіс"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Захаваць сьпіс як Візытоўку (VCard)"
 
@@ -2481,13 +2505,13 @@ msgid "Email begins with"
 msgstr "Э. пошта пачынаецца з"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Катэгорыя"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле ўтрымлівае"
 
@@ -2504,101 +2528,101 @@ msgid "Type"
 msgstr "Тып"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Захаваць як візытоўку (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Новы кантакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Новы сьпіс кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Пераход у тэчку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Імпарт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Пошук кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Крыніцы кнігі адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Усталёўкі \"Пілёта\"..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Пераслаць кантакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друк"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Друкаваць паштоўку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Кніга адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Кніга адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Выразаць"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Капіяваць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Уставіць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Бягучы выгляд"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2611,8 +2635,8 @@ msgstr ""
 "гэта нанава"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Любая катэгорыя"
 
@@ -2655,7 +2679,7 @@ msgid "Company Phone"
 msgstr "Тэлефон установы"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Э. пошта"
 
@@ -2717,7 +2741,7 @@ msgid "Nickname"
 msgstr "Мянушка"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Заўвага"
 
@@ -2726,7 +2750,7 @@ msgid "Office"
 msgstr "Офіс"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Установа"
 
@@ -2854,69 +2878,75 @@ msgstr "Вылучаны"
 msgid "Has Cursor"
 msgstr "Мае курсор"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Удзельнікі"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Э. пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Праца"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Бостан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Група"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Пэрсанальнае"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Більбао"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Паса_да:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Хатні факс"
@@ -2926,8 +2956,8 @@ msgid "Success"
 msgstr "Пасьпяхова"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2959,7 +2989,7 @@ msgstr "Пратакол не падтрымліваецца"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2979,7 +3009,8 @@ msgid "TLS not Available"
 msgstr "TLS адсутнічае"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Кніга адрэсаў адсутнічае"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3121,7 +3152,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Дадаць адрэсу да кантакта \"%s\", які ўжо існуе"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Запыт да кнігі адрэсаў..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3179,18 +3211,38 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Імпарт LDIF \"Эвалюцыі\""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Фармат узаемаабмену даньнямі LDAP (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Імпарт візытовак \"Эвалюцыі\"."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Імпарт візытовак \"Эвалюцыі\"."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Друкаваць вылучаныя кантакты"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Друкаваць вылучаныя кантакты"
@@ -3283,7 +3335,7 @@ msgstr "Палі"
 msgid "Number of columns:"
 msgstr "Колькасьць слупкоў:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Парамэтры"
 
@@ -3466,8 +3518,8 @@ msgstr "Назва файла не пазначана."
 msgid "Unnamed List"
 msgstr "Сьпіс бяз назвы"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Пазначце пароль"
@@ -3548,10 +3600,9 @@ msgid "Evolution's Tasks component"
 msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Заданьні"
 
@@ -3595,26 +3646,24 @@ msgstr "Нагадаць пасьля (хвіліны)"
 msgid "_Edit appointment"
 msgstr "_Рэдагаваць сустрэчу"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Адкрыць"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Адкрыць"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Апісаньне недаступна."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3623,12 +3672,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Папярэджаьне"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3640,7 +3689,7 @@ msgstr ""
 "\"Эвалюцыя\" будзе адлюстроўваць замест гэтага звычайны дыялёг\n"
 "нагадваньня."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3656,19 +3705,19 @@ msgstr ""
 "\n"
 "Вы сапраўды жадаеце выканаць гэтую праграму?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Болей не распавядаць мне пра гэтую праграму."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Неатрымалася ініцыялізаваць Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Немагчыма ініцыялізаваць gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Немагчыма стварыць вытворчасьць паслугі нагадваньня"
 
@@ -3813,24 +3862,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Паказаць нумары тыдняў у навігатары па датах"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Агульныя зьвесткі утрымліваюць"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Апісаньне ўтрымлівае"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Камэнтар утрымлівае"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Апісаньне ўтрымлівае"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Іншая пошта"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Каляндар"
 
@@ -3863,7 +3918,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3885,77 +3940,77 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Новая сустрэча"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Сустрэча"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Нарада"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Стварыць запыт новае нарады"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Новая сустрэча на увесь дзень"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Сустрэча на увесь _дзень"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Ка_ляндар:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Стварыць новую тэчку"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4090,7 +4145,7 @@ msgstr "гадзіны"
 msgid "minutes"
 msgstr "хвіліны"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4163,7 +4218,7 @@ msgid "hour(s)"
 msgstr "гадзіна (ы)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "хвіліна(ы)"
 
@@ -4174,7 +4229,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Уключана"
 
@@ -4226,7 +4281,7 @@ msgstr "30 хвілін"
 msgid "60 minutes"
 msgstr "60 хвілін"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Сыгналы"
 
@@ -4251,7 +4306,7 @@ msgid "Days"
 msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Уключыць"
 
@@ -4394,7 +4449,7 @@ msgid "_Fri"
 msgstr "_Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Асноўнае"
 
@@ -4498,7 +4553,7 @@ msgstr ""
 "пазначаныя тутака."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Зьпіс заданьняў"
@@ -4672,23 +4727,23 @@ msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?
 msgid "Validation error: %s"
 msgstr "Памылка зацьверджаньня: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " да "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Выканана "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Выканана "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Патрэба "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Умоўленае"
 
@@ -4724,8 +4779,8 @@ msgstr "Запіс часопіса - %s"
 msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Захаваць як..."
 
@@ -4754,11 +4809,21 @@ msgstr "Адменена апэрацыі"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Каляндар"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Зьпіс заданьняў"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4865,7 +4930,7 @@ msgstr "Дэлегаваць да:"
 msgid "Enter Delegate"
 msgstr "Пазначце дэлегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Сустрэча"
 
@@ -4889,23 +4954,31 @@ msgstr "Плянаваньне"
 msgid "Meeting"
 msgstr "Нарада"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Дата пачатку памылковая"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Дата завяршэньня памылковая"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Час пачатку памылковы"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Час заканчэньня памылковы"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Адсутнічаюць правы на адкрыцьцё каляндара"
@@ -4986,29 +5059,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Няма"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Неабходны арганізатар."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Патрабуе хаця б аднаго удзельніка."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Дэлегаваць у..."
 
@@ -5206,7 +5279,7 @@ msgstr "на"
 msgid "occurrences"
 msgstr "выпадкі"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Дата/Час:"
@@ -5243,7 +5316,7 @@ msgid "_No recurrence"
 msgstr "_Бяз вяртаньня"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Выдаліць"
 
@@ -5285,7 +5358,7 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Адкінуць зьмены"
 
@@ -5309,7 +5382,7 @@ msgstr "Зьвесткі па заданьні створаны. Даслаць?
 msgid "The task information has changed. Send an updated version?"
 msgstr "Зьвесткі па заданьні зьменены. Даслаць і абнавіць вэрсыю?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Дата заканчэньня выкананьня памылковая"
 
@@ -5322,7 +5395,7 @@ msgstr "% Завершана"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Выканана"
 
@@ -5335,7 +5408,7 @@ msgstr "Высокі"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Выконваецца"
 
@@ -5354,7 +5427,7 @@ msgstr "Нармальны"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Не распачаты"
 
@@ -5396,16 +5469,16 @@ msgstr "Асноўнае"
 msgid "Assignment"
 msgstr "Прызначэньне"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Умоўленая дата памылковая"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
@@ -5416,7 +5489,7 @@ msgstr "_Сакрэтна"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Апісаньне:"
 
@@ -5610,11 +5683,10 @@ msgstr "Дата пачатку"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Агульныя зьвесткі"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "колер"
 
@@ -5640,7 +5712,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5675,10 +5747,10 @@ msgstr "Не"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Невядома"
@@ -5691,99 +5763,105 @@ msgstr "Паўтор"
 msgid "Assigned"
 msgstr "Прызначана"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Выдаленьне вылучаных аб'ектаў"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Абнаўленьне аб'ектаў"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Новая _сустрэча..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Новая падзея на ўвесь дзень"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Друкаваць..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Перайсьці да _сёньня"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Адкрыць"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Захаваць _як..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Капіяваць"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Заплянаваць нараду..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Перадаслаць як iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Выдаліць гэтую зьяву"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Выдаліць _усе зьявы"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Усталёўкі..."
 
@@ -5871,7 +5949,7 @@ msgid "Alarms"
 msgstr "Сыгналы"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Выкананьне"
 
@@ -5929,26 +6007,26 @@ msgstr "дзяленьні %02i хвіліны"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6131,7 +6209,7 @@ msgid "Send Latest Information"
 msgstr "Даслаць апошнюю інфармацыю"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Адмяніць"
@@ -6588,12 +6666,12 @@ msgstr "_Прыярытэт:"
 msgid "Web Page:"
 msgstr "Старонка"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Клікніце каб дадаць заданьне"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6603,7 +6681,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6611,12 +6689,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Адкрыцьцё заданьняў %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6625,29 +6703,39 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Загрузка відарысаў"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Сустрэчы не заплянаваны."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Адкрыць у %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6767,16 +6855,16 @@ msgstr "Інфармацыя \"Вольны/Заняты\" (%s да %s)"
 msgid "iCalendar information"
 msgstr "Інфармацыя iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Вы мусіце быць удзельнікам падзеі"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6784,7 +6872,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6792,12 +6880,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6986,49 +7074,49 @@ msgstr "Вылучаны месяц (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Вылучаны год (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Заданьне"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Прыярытэт: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Адсоткі выкананьня: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Катэгорыі: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Кантакты: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Друк элемэнта"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Наладка друку"
 
@@ -7037,39 +7125,39 @@ msgstr "Наладка друку"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Заданьне"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7126,20 +7214,20 @@ msgstr "Файлы каляндара \"iCalendar\" (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Файлы каляндара \"vCalendar\" (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Публічная тэчка утрымлівае сустрэчы і падзеі"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Нагаданьне!!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Падзеі каляндара"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7147,7 +7235,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала файлы каляндара Gnome.\n"
 "Ці жадаеце імпартаваць іх у \"Эвалюцыю\"?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Каляндар GNOME"
 
@@ -8809,7 +8897,7 @@ msgstr "Немагчыма адкрыць паведамленьне"
 msgid "Failed on message %d"
 msgstr "Збой на паведамленьні %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Сынхранізацыя тэчкі"
 
@@ -8896,7 +8984,7 @@ msgstr "Капіяваньне паведамленьняў"
 msgid "Filtering new message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8907,15 +8995,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Памылка пад час апрацоўкі падказкі gpg userid."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Памылка пад час апрацоўкі запыту парольнае фразы gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8924,34 +9012,30 @@ msgstr ""
 "Вам патрэбны пароль каб разблякаваць ключ для\n"
 "карыстальніка: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Адменена."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Збой пад час разблякаваньня сакрэтнага ключа: пазначана 3 некарэктныя "
 "парольныя фразы."
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Нечаканы адказ ад GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Няма даньняў"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Неатрымліваецца зашыфраваць гэтае паведамленьне: Невызначаны карэктныя "
 "атрымоўцы."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8962,34 +9046,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збой у GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Збой выкананьня gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Збой выкананьня gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -8998,29 +9082,29 @@ msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Цела індэкса утрымлівае"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
@@ -9133,23 +9217,36 @@ msgstr "Збой пад час лэкадаваньня часткі MIME: не�
 msgid "parse error"
 msgstr "памылка разбору"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Правайдэр віртуальных тэчак электронае пошты"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Для чытаньня пошты па запыце да іншага збору тэчак"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Неатрымалася загрузіць %s: Загрузка модуляў не падтрымліваецца ў гэтае "
 "сыстэме."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Немагчыма загрузіць %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Немагчыма загрузіць %s: няма кода ініцыялізацыі ў модуле."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Правайдэр для пратакола \"%s\" недаступны"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Ананімна"
@@ -9302,7 +9399,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
 
@@ -9441,20 +9538,7 @@ msgstr "Вызначэньня адрэсы вузла не адбылося: а
 msgid "Host lookup failed: unknown reason"
 msgstr "Вызначэньня адрэсы вузла не адбылося: прычына невядома"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Правайдэр віртуальных тэчак электронае пошты"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Для чытаньня пошты па запыце да іншага збору тэчак"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Правайдэр для пратакола \"%s\" недаступны"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9524,21 +9608,25 @@ msgstr "Паслужнік: %s, Тып: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Неатрымалася атрымаць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Неатрымалася стварыць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Сьметніца"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9771,21 +9859,31 @@ msgstr "Паведамленьне %s адсутнічае ў %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Немагчыма закрыць часовую тэчку: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Немагчыма закрыць часовую тэчку: %s"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9804,16 +9902,11 @@ msgstr ""
 "гэтым паслужніку"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Аўтаматычна правяраць пошту кожныя"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Кніга адрэсаў"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9833,44 +9926,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Пароль"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Далучэньне да IMAP паслужніка будзе адбывацца з выкарыстаньнем "
 "незашыфраванага пароля."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Дапомна"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Густая дымка"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Дзеяньне адмененае"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Паслужнік нечакана адключыўся: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9879,26 +9970,26 @@ msgstr ""
 "Сыгнал ад паслужніка IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Заўчасны канец адказу паслужніка."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Адказ IMAP паслужніка ня ўтрымлівае інфармацыю пра %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Нечаканы адказ \"Добра\" ад IMAP паслужніка: %s"
@@ -9913,7 +10004,7 @@ msgstr "Немагчыма стварыць каталёг %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Немагчыма загрузіць агульныя зьвесткі для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Тэчка была зьнішчана і нанава створана на паслужніку."
 
@@ -9922,12 +10013,12 @@ msgstr "Тэчка была зьнішчана і нанава створана
 msgid "Scanning for changed messages"
 msgstr "Сканаваньне зьмененых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Немагчыма арымаць паведамленьне: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9943,25 +10034,25 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Гэтае паведамленьне ў бягучы момант недаступна"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Атрыманьне агульнае інфармацыі для новых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Немагчыма адшукаць цела паведамленьня ў адказе FETCH."
 
@@ -10021,27 +10112,37 @@ msgstr ""
 "Ужыць фільтры да усіх новых паведамленьняў у тэчцы \"Атрыманыя\" (INBOX) на "
 "гэтым паслужніку"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Праверка новае пошты ўва ўсіх тэчках"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Праверка новае пошты ўва ўсіх тэчках"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Паслужнік IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "паслуга IMAP для %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10050,65 +10151,65 @@ msgstr "паслуга IMAP для %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Пашырэньне SSL/TLS не падтрымліваецца."
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Збой узгадненьня SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Паслужнік IMAP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Вы не пазначылі пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10119,24 +10220,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Тэчка %s адсутнічае "
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невядомая бацькоўская тэчка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Гэтая тэчка ня можа утрымліваць падтэчкі"
 
@@ -10158,7 +10267,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Немагчыма далучыцца да паслужніка POP %s"
@@ -10237,8 +10346,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10250,55 +10359,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Лакальнае сховішча ня мае тэчкі \"Атрыманае\""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Лакальны файл пошты %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Немагчыма зьмяніць назву '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Неатрымалася выдаліць выніковы файл тэчкі \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Немагчыма захаваць вынік: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Неатрымалася дадаць паведамленьне да выніку: прычына невядома"
 
@@ -10316,55 +10425,46 @@ msgstr "Немагчыма дадаць паведамленьне да тэчк
 msgid "Invalid message contents"
 msgstr "Нерэчаісны зьмест паведамленьня"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Немагчыма адкрыть тэчку \"%s\":\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Тэчка \"%s\" не існуе."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Неатрымалася стварыць тэчку \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" не зьяўляецца паштовым каталёгам."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 "Немагчыма выдаліць тэчку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "не зьяўляецца паштовым каталёгам"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10386,9 +10486,9 @@ msgid "Checking for new messages"
 msgstr "Праверыць наяўнасьць новых паведамленьняў"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Захаваньне тэчкі"
@@ -10432,159 +10532,137 @@ msgstr "Магчыма тэчка сапсавана й ня можа быць �
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збой у канструкцыі паведамленьня: паштовая скрыня пашкоджана?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Немагчыма адкрыць файл \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Немагчыма стварыць тэчку з гэткай назвай"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Немагчыма стварыць каталёг %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Немагчыма укласьці файл %s: не зьяўляецца сталым файлам"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Неатрымалася стварыць файл \"%s\":\n"
+"Немагчыма выдаліць тэчку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "%s не зьяўляецца звычайным файлам."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Немагчыма выдаліць тэчку \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тэчка \"%s\" не пустая. Не выдалена."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Немагчыма стварыць тэчку з гэткай назвай"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Пазначаная назва тэчкі недапушчальна: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Немагчыма зьмяніць назву '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Немагчыма адкрыць тэчку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальная памылка паштовага аналізатара каля пазыцыі %ld у тэчцы %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Немагчыма праверыць тэчку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Немагчыма адкрыць файл: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Неатрымалася адкрыць часовую паштовую скрыню: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Немагчыма закрыць тэчку крыніцы %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Немагчыма закрыць часовую тэчку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несупадзеньне тэчкі і выніка, нават пасьля сынхранізацыі"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невядомая памылка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Немагчыма захаваць тэчку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Памылка запісу у часовую паштовую скрыню: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Збой запісу ў часовую паштовую скрыню: %s: %s"
@@ -10598,10 +10676,17 @@ msgstr "Даданьне паведамленьня да тэчкі MH адме�
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Неатрымалася стварыць тэчку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" не зьяўляецца каталёгам."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10623,6 +10708,29 @@ msgstr "Спул \"%s\" не зьяўляецца звычайным файла�
 msgid "Folder `%s/%s' does not exist."
 msgstr "Тэчка \"%s%s\" не існуе."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Немагчыма адкрыть тэчку \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Тэчка \"%s\" не існуе."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Неатрымалася стварыць тэчку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10861,47 +10969,47 @@ msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Невядомая памылка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Не адшукана тэчка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Немагчыма атрымаць групу: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Неатрымалася даслаць паведамленьне: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Збой каманды NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Сканаваннье новых паведамленьняў"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Невядомы адказ паслужніка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Адмяніце"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збой апэрацыі: %s"
@@ -10948,7 +11056,7 @@ msgstr "Выдаляць праз %s дзён"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11038,7 +11146,7 @@ msgid "No such folder `%s'."
 msgstr "Няма гэткае тэчкі \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11092,7 +11200,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Дастаўка пошты праз праграму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11261,7 +11369,7 @@ msgstr "Дастаўка пошты SMTP праз %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Немагчыма даслаць паведамленьне: памылковая адрэса адпраўляльніка."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Адпраўка паведамленьня"
 
@@ -11370,34 +11478,34 @@ msgstr "Перавышаны час чаканьня адказу на запы�
 msgid "QUIT response error"
 msgstr "Памылка адказу на QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "укладаньне"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Выдаліць выбраныя элемэнты са сьпіса укладаньняў"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Дадаць укладаньне..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Укласьці файл у паведамленьне"
 
@@ -11518,20 +11626,20 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Attach file(s)"
 msgstr "Укласьці файл(ы)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11540,30 +11648,30 @@ msgstr ""
 "Памылка пад час чытаньня файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Файл існуе, перапісаць?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Памылка захаваньня файла: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Памылка пад час загрузкі файла: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Памылка доступу да файла: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11572,7 +11680,7 @@ msgstr ""
 "Немагчыма зрушыць па файле: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11581,7 +11689,7 @@ msgstr ""
 "Немагчыма усекчы файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11590,7 +11698,7 @@ msgstr ""
 "Немагчыма скапіяваць дэскрыптар файла: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11599,7 +11707,7 @@ msgstr ""
 "Памылка аўтазахаваньня паведамленьня: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11608,7 +11716,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала незахаваныя файлы з папярэдняга сэанса.\n"
 "Жадаеце пспрабаваць аднавіць іх?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11619,43 +11727,43 @@ msgstr ""
 "\n"
 "Жадаеце захаваць зьмены?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Увага: Зьмененае паведамленьне"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Адкрыцьцё файла"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Подпіс:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Створана аўтаматычна"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Стварыць паведамленьне"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11663,7 +11771,7 @@ msgstr ""
 "Немагчыма стварыць акно рэдактара.\n"
 "Немагчыма актывізаваць кіраваньне выбарам адрэсы."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11675,7 +11783,7 @@ msgstr ""
 "Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
 "gtkhtml і libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11683,7 +11791,7 @@ msgstr ""
 "Неатрымалася стварыць акно рэдактара:\n"
 "Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12031,7 +12139,7 @@ msgstr "Тады"
 msgid "You must specify a folder."
 msgstr "Вы мусіце пазначыць тэчку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
@@ -12046,19 +12154,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Важнае"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Трэба выканаць"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Пазьней"
 
@@ -12148,7 +12256,7 @@ msgstr ""
 "Дата паведамленьня будзе параўнана з\n"
 "12 гадзінамі пазначанай даты."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Віртуальныя тэчкі"
 
@@ -12164,7 +12272,7 @@ msgstr "раней"
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "сэкундаў"
 
@@ -12334,7 +12442,7 @@ msgstr "не пазначана"
 msgid "Junk Test"
 msgstr "Чэрвень"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Адмеціна"
@@ -12442,9 +12550,10 @@ msgstr "пачынаецца з"
 msgid "Stop Processing"
 msgstr "Спыніць апрацоўку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Тэма"
 
@@ -12452,25 +12561,25 @@ msgstr "Тэма"
 msgid "Unset Status"
 msgstr "Адмяніць папярэдні стан"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Пазва правіла '%s' ня ўнікальна, выбярыце іншую."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Правілы"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Дадаць правіла"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Рэдагаваць правіла"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Назва правіла"
 
@@ -12510,15 +12619,15 @@ msgstr "Тэма ўтрымлівае"
 msgid "Subject does not contain"
 msgstr "Тема ня ўтрымлівае"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Вы мусіце назваць гэтую віртуальную тэчку."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Вам трэба пазначыць хаця бы адну тэчку ў якасьці крыніцы."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Крыніца віртуальнае тэчкі"
 
@@ -12570,9 +12679,9 @@ msgstr "Праглядальнік паштовае тэчкі \"Эвалюцы�
 msgid "Evolution Mail preferences control"
 msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Пошта"
 
@@ -12580,7 +12689,7 @@ msgstr "Пошта"
 msgid "Mail Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Перавагі пошты"
 
@@ -12618,15 +12727,15 @@ msgstr "Неабходна пазначыць правільную назву с
 msgid "[script]"
 msgstr "[сцэнар]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Мова(ы)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Дадаць подпіс сцэнара"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Подпіс(ы)"
 
@@ -12709,7 +12818,6 @@ msgid "Unread messages"
 msgstr "Наступнае нечытанае паведамленьне"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<клікніце тутака для выбару тэчкі>"
 
@@ -12717,398 +12825,417 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Create New Folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Пазначце дзе стварыць тэчку:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Назва тэчкі:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Атрыманае"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 "Немагчыма выдаліць тэчку \"%s\":\n"
 "%s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Сапраўды выдаліць тэчку \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Выдаліць \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Зьмяніць назву тэчкі \"%s\" на:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Зьмяніць назву тэчкі"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Адкрыць у новым акне"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Перамясьціць"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Новая тэчка..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Зьмяніць _назву"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Уласьцівасьці..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Зьмяніць як новае паведамленьне..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Друк"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Адказаць у сьпіс"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Адказаць усім"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Перадаслаць"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Падняцца вышэй..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Выкананы сьцяг"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Ачысьціць сьцяг"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Пазначыць як чытанае"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Пазначыць як неважнае"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Вярнуць"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Капіяваць у тэчку..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "_Ужыць фільтары"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Стварыць правіла з паведамленьня"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Віртуальная тэчка па тэме"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Віртуальная тэчка па атрымоўцы"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Віртуальная тэчка па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Фільтар па тэме"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Фільтар па адпраўляльніку"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Фільтар па атрымоўцы"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Фільтар па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Фільтар па адпраўляльніку"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Дапомна"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Друк паведамленьня"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скапіяваць спасылку"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клікніце каб дадаць заданьне"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Супадзеньні:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Прызначана"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
 "тоеснасьць."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Рэдагаваць подпіс"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Рэдагаваць подпіс"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Перарвана"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Кадаваньне PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Сэртыфікат яшчэ не зацьверджаны"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Пратэрмінавана:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Убудаваны прагляд"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Схаваць"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Аркуш %d з %d"
@@ -13152,29 +13279,34 @@ msgstr "Указальнік на невядомыя вонкавыя даньн
 msgid "Formatting message"
 msgstr "Перамяшчэньне паведамленьняў"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Ад каго"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Сх.копія"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Паштавік"
 
@@ -13188,8 +13320,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "Дата"
 
@@ -13207,21 +13339,26 @@ msgstr "Неатрымалася разабраць паведамленьне M
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Тэма не падтрымліваецца"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Немагчыма праверыць подпіс"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Немагчыма праверыць подпіс"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13233,60 +13370,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Збой у кэшы %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Збой у кэшы %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Збой пад час стварэньня канала да \"%s\": %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Збой вызначэньня вузла \"%s\": %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Захаваць як..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Паведамленьне бяз назвы"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Адкрыць спасылку ў аглядальніке"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Даслаць паве_дамленьне ў сьпіс..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Адкрыць у %s..."
@@ -13336,18 +13473,18 @@ msgstr "Фільтары"
 msgid "-------- Forwarded Message --------"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13356,7 +13493,7 @@ msgstr ""
 "Немагчыма захаваць у `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13365,32 +13502,38 @@ msgstr ""
 "`%s' ужо існуе.\n"
 "Перазапісаць?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Паведамленьне"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Захаваць паведамлеьне як..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Адрэса"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Ліст ад %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неатрымалася стварыць часовы каталёг: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13403,7 +13546,7 @@ msgstr ""
 "\n"
 "Сапраўды сьцёрці паведамленьні?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13431,211 +13574,225 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Дапомная тэма паведамленьня."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Дапомная тэма паведамленьня."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Шукаць тэкст у целе адлюстраванага паведамленьня"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Стыль перасылкі:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Дапомная тэма паведамленьня."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Дапомная тэма паведамленьня."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Стыль _адказа:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Схаваць панэлю лычак"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Схаваць панэлю лычак"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Выканаць дзеяньні"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13644,110 +13801,104 @@ msgstr ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Даслаць ліст у фармаце HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Даслаць ліст у фармаце HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Паказаць паведамленьне ў звычайным стылі"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Акно перадпрагляду"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Граць файл, калі атрымана новая пошта"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Праверка правапіса"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Тэрмінальны шрыфт:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13755,172 +13906,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Зрабіць дапомным уліковым запісам"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Пераменая шырыня:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Імпарт"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Імпарт у \"Эвалюцыю\" з Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Імпарт у \"Эвалюцыю\" з mbox"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "\"Эвалюцыя\" імпартуе вашую старую пошту Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Імпартаваньне..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Калі ласка, пачакайце"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Імпартаваньне %s як %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканаваньне %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Імпартаваньне файлаў"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13928,16 +14076,44 @@ msgstr ""
 "\"Эвалюцыя\" адшукала паштовыя файлы Elm.\n"
 "Жадаеце імпартаваць іх у \"Эвалюцыю\"?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Выдаліць гэтую тэчку"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Імпартаваньне"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Імпартаваньне файлаў"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканаваньне %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Прыярытэтны фільтар \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13952,7 +14128,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13960,7 +14136,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13969,31 +14145,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Сканаваньне фільтараў пошты"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Сканаваньне каталёга"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Распачата імпартаваньне"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Усталёўкі"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Фільтары пошты"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14001,11 +14170,20 @@ msgstr ""
 "\"Эвалюцыя\" адшукала паштовыя файлы Netscape.\n"
 "Жадаеце імпартаваць іх у \"Эвалюцыю\"?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Імпартаваньне файлаў"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Кніга адрэсаў"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14013,7 +14191,7 @@ msgstr ""
 "\"Эвалюцыя\" адшукала паштовыя файлы Pine.\n"
 "Жадаеце імпартаваць іх у \"Эвалюцыю\"?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14056,19 +14234,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Вы не пазначылі ўсё неабходную інфармацыю."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Рэдактар уліковага запіса \"Эвалюцыі\""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Вузел:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Імя карыстальніка:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Шлях:"
 
@@ -14120,28 +14298,43 @@ msgstr ""
 "    '%s'\n"
 "І будзе абноўлена."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Маюцца недасланыя паведамленьні! Вы жадаеце завяршыць працу?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Новае паштовае паведамленьне"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Паштовае паведамленьне"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Скласьці новае паведамленьне"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Новая віртуальная тэчка"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Фільтары пошты"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Стварыць новую тэчку"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, які будзе адлюстроўваць каляндар"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "сапраўдны"
 
@@ -14181,7 +14374,7 @@ msgstr ""
 "Калі ласка, пазначце інфармацыю аб шляхах адпраўкі пошты. Калі вы няпэўныя, "
 "запытайцеся вашага сыстэмнага адміністратара ці правайдэра паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Кіраваньне рахункамі"
 
@@ -14203,121 +14396,116 @@ msgid "Connecting to server..."
 msgstr "Далучэньне да паслужніка..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " Праверка тыпаў якія падтрымліваюцца "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL не падтрымліваецца ў гэтае зборцы \"Эвалюцыі\")"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL не падтрымліваецца ў гэтае зборцы \"Эвалюцыі\")"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Заўсёды шыфраваць маім ключом пад час адпраўленьня паведамленьня"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Рэдактар уліковых запісаў"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Зьвесткі аб уліковым запісе"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Дадаць _сцэнар"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Дадаць новы подпіс..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Заўсёды шыфраваць маім ключом пад час адпраўкі шыфраванае пошты"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Заўсёды дасылаць нябачную копію (Bcc) на:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Заўсёды дасылаць копію (Cc) на:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Заўсёды давяраць ключам у маім зборы ключоў пад час кадаваньня"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Укласьці арыгінальнае паведамленьне"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Укладаньне"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Аўтарызацыя"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балцкая (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балцкая (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "Колеры"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Праверка новае пошты"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Правяраць правапіс пад час уводу тэкста"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Праверка новае пошты"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Колер для памылковых словаў:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Стварэньне паведамленьняў"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Канфігурацыя"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14333,292 +14521,288 @@ msgstr ""
 "\n"
 "Клікніце \"Ужыць\" каб захаваць вашыя усталёўкі."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Дапомна"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Дапомныя паводзіны"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Дапомнае кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Выдаленьне пошты"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Не цытавацьь зыходнае паведамленьне"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не падпісываць запыты на нараду (для сумяшчальнасьці з Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Зроблена"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Тэчка чарнавіка:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Электроная адрэса пошты:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Дапаможнік уліковага запісу \"Эвалюцыі\""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Выканаць каманду..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Фіксаваная шырыня:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Менш можнасьцяў"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Уласьцівасьці шрыфта"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Фарматаваць паведамленьні ў HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Загаловак"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Вылучаць _цытаваньне:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "убудаваны"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Адмеціны і колеры"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Загрузка відарысаў"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Наладка пошты"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Разьмяшчэньне паштовае скрыні"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Рэдактар паведамленьняў"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Адлюстраваньне паведамленьняў"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Шрыфт паведамленьня"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Дадатковая інфармацыя"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Установа:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "Ід ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Выбярыце колер"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Шрыфты для друку"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Паштовы каталёг Qmail"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Цытаваць арыгінальнае паведамленьне"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Працытавана"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Адказаць на:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Парамэтры атрыманьня"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Неабходная інфармацыя"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Аднавіць дапомнае"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Бясьпека"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Абараніць MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні для друку"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Тэчка дасланых паведамленьняў:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Дасланыя паведамленьні і чарнавікі"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Паслужнік патрабуе аўтарызацыю"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Наладка паслужніка"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Тып паслужніка: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Самападпісаны сэртыфікат у ланцужку"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Пазначце назву файла:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Праверка правапіса"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Стандартны файл Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14627,7 +14811,7 @@ msgstr ""
 "Гэтая старонка дазваляе наладзіць паводзіны праверкі правапіса і мову. Сіпіс "
 "моваў адлюстроўвае толькі мовы, слоўнікі якіх усталяваны ў вашае сыстэме."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14635,15 +14819,15 @@ msgstr ""
 "Пазначце назву для гэтага рахунка.\n"
 "Да прыкладу: \"Праца\" ці \"Асабістае\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Пераменая шырыня:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14653,177 +14837,177 @@ msgstr ""
 "\n"
 "Калі ласка, клікніце \"Наперад\" каб пачаць. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Дадаць подпіс"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Заўсёды загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Тып аўтарызацыі: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Тып аўтарызацыі: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Аўтаматычна правяраць пошту кожныя"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Аўтаматычна устаўляць відарысы \"усьмешак\""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Гукавы сыгнал пад час атрыманьня новае пошты"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Запытвацца падцьверджаньня ачысткі тэчкі ад выдаленых паведамленьняў"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Дапомны подпіс:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Дапомнае"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не паведамляць пра атрыманьне новай пошты"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Стыль перасылкі:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "Поўнае імя:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "По_шта у HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Тоеснасьць"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Чэрвень"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Загрузіць відарысы, калі адпраўляльнік ёсьць у кнізе адрэсаў"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Зрабіць дапомным уліковым запісам"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Паз_начаць паведамленьні як \"Прачытанае\" праз:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Ніколі не загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Граць файл, калі атрымана новая пошта"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Папярэджваць пад час адпраўкі паведамленьняў з пустой тэмай"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Атрыманьне пошты"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Стыль _адказа:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Вярнуць дапомнасьці"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Сцэнар:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Выдаліць..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "А_дпраўка пошты"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Подпісы"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Стандартны шрыфт:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Тэрмінальны шрыфт:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Выкарыстоўваць тойжа шрыфт што і аснатнія дастасаваньні"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "апісаньне"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
@@ -14846,7 +15030,7 @@ msgstr ""
 "Памылка пад час выкананьня апэрацыі:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Праца"
 
@@ -14858,128 +15042,128 @@ msgstr "Фільтраваньне тэчкі"
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Адпраўленьне \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14988,7 +15172,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14997,11 +15181,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15010,22 +15194,22 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15060,38 +15244,38 @@ msgstr "Выключэньні"
 msgid "Security Information"
 msgstr "Зьвесткі аб уліковым запісе"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Адмена..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тып: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Атрыманьне і адпраўленьне пошты"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Адмяніць _усё"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Абнаўленьне..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
@@ -15200,20 +15384,20 @@ msgstr ""
 "    \"%s\"\n"
 "І быдзе абноўлена."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба рэдагаваць віртуальную тэчку '%s' якая не існуе."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
@@ -15540,97 +15724,20 @@ msgstr "Лакальныя тэчкі"
 msgid "Autocompletion Folders"
 msgstr "Тэчкі аўтазавяршэньня"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Немагчыма капіяваць тэчку: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Немагчыма перамясьціць тэчку: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Немагчыма перанесьці тэчку ў саму сябе."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Немагчыма капіяваць тэчку ў саму сябе."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Пазначце тэчку для капіяваньня ў яе тэчкі \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Капіяваць тэчку"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Пазначце тэчку для пераносу ў яе тэчкі \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Перамясьціць тэчку"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Немагчыма выдаліць тэчку:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Сапраўды выдаліць тэчку \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Немагчыма зьмяніць назву тэчкі:\n"
+"Немагчыма стварыць пазначаную тэчку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Пазначаная назва тэчкі недапушчальна: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Немагчыма зьмяніць назву тэчкі:\n"
-" %s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Немагчыма стварыць пазначаную тэчку:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Бяз назвы)"
@@ -15771,7 +15878,7 @@ msgstr "Збой выкананьня gpg."
 msgid "_Import"
 msgstr "Імпарт"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Закрыцьцё далучэньняў..."
 
@@ -15809,6 +15916,10 @@ msgstr "Не атрымалася адкрыць падзеленую тэчку
 msgid "Cannot find the specified shared folder."
 msgstr "Немагчыма адшукаць пазначаную падзеленую тэчку."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Распачата імпартаваньне"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15918,123 +16029,6 @@ msgstr "Адсутніча канфігурацыя базы даньняў"
 msgid "Generic error"
 msgstr "Звычайная памылка"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Стварыць новую групу лычак"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Назва групы:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Вы сапраўды жадаеце зьмяніць назву групы \"%s\" з панэлі лычак?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Зьмяніць назву групы лычак"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Зьмяніць назву вылучанае групы лычак на:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Малыя значкі"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Паказаць лычкі як малыя значкі"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Вялікія значкі"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Паказаць лычкі як вялікія значкі"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Дадаць групу..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Стварыць новую групу лычак"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Выдаліць групу..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Выдаліць групу лычак"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Зьмяніць назву групы..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Зьмяніць назву групы лычак"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Схаваць панэлю лычак"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Схаваць панэлю лычак"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Стварыць дапомныя _лычкі"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Стварыць дапомныя лычкі"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Зьмяніць назву лычкі"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Зьмяніць назву вылучанай тэчкі на:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Адкрыць тэчку зьвязаную з гэтай лычкай"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Адкрыць у новым акне"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Адкрыць тэчку зьвязаную з гэтай лычкай у новым акне"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Зьмяніць назву лычкі"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Выдаліць"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Выдаліць гэтую лычку з панэлі лычак"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Памылка захаваньня лычак."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Лычкаі"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Пазначальнік"
@@ -16045,11 +16039,6 @@ msgstr "Пазначальнік"
 msgid "New"
 msgstr "Стварыць"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" у \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16336,59 +16325,59 @@ msgstr ""
 "%s: --online і --offline не могуць выкарыстоўвацца разам.\n"
 "  Use %s --help для атрыманьня падрабязнасьцяў.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Выбраць імпарт"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Выкананьне"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Выраз"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрэса пошты:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Сэртыфікат састарэў: %s\n"
 "Выдавец: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Пазначце пароль для %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16455,7 +16444,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Ід сэртыфіката:"
@@ -16530,11 +16519,11 @@ msgstr "Пасада"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16583,239 +16572,239 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " °C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "Так"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Сэртыфікат ненадзейны"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "Iд"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Тэма %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Неатрымалася апрацаваць тэчку спула"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Запускаецца:"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Зьвесткі адсутнічаюць"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "укладаньне"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Харватыя"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Выраз"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s на %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Подпіс сэртыфіката памылковы"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "Уставіць"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Тэма %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Подпіс сэртыфіката памылковы"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Пазначце пароль для %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Ід сэртыфіката:"
@@ -17414,7 +17403,8 @@ msgid "_Threaded Message List"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "_Дадаць адпраўляльніка ў кнігу адрэсаў"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17422,7 +17412,8 @@ msgid "A_pply Filters"
 msgstr "_Ужыць фільтары"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17878,10 +17869,6 @@ msgstr "Фармат"
 msgid "HT_ML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Адкрыць"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Адкрыць файл"
@@ -18251,22 +18238,6 @@ msgstr "Даслаць / Атрымаць"
 msgid "_Window"
 msgstr "_Шукаць зараз"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Надрукаваць агульныя зьвесткі"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Надрукаваць агульныя зьвесткі"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Перагрузка"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Перагрузіць прагляд"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Па установах"
@@ -18333,8 +18304,8 @@ msgstr "з _катэгорыяй"
 msgid "_Tasks"
 msgstr "_Заданьні"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18581,23 +18552,23 @@ msgstr "По_шук"
 msgid "_Find Now"
 msgstr "_Шукаць зараз"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "А_чысьціць"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ІД пункта"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ІД падпункта"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Тэкст"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Шукаць зараз"
@@ -18612,6 +18583,200 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завершана)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Крыніцы кнігаў адрэсаў..."
+
+#~ msgid "No data provided"
+#~ msgstr "Няма даньняў"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Немагчыма адкрыць файл \"%s\":\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Немагчыма стварыць каталёг %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неатрымалася стварыць файл \"%s\":\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "\"%s\" не зьяўляецца каталёгам."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Імпартаваньне %s як %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Сканаваньне фільтараў пошты"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Сканаваньне каталёга"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Немагчыма капіяваць тэчку: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Немагчыма перамясьціць тэчку: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Немагчыма перанесьці тэчку ў саму сябе."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Немагчыма капіяваць тэчку ў саму сябе."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Пазначце тэчку для капіяваньня ў яе тэчкі \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Капіяваць тэчку"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Пазначце тэчку для пераносу ў яе тэчкі \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Перамясьціць тэчку"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Немагчыма выдаліць тэчку:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Сапраўды выдаліць тэчку \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Немагчыма зьмяніць назву тэчкі:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Немагчыма зьмяніць назву тэчкі:\n"
+#~ " %s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Стварыць новую групу лычак"
+
+#~ msgid "Group name:"
+#~ msgstr "Назва групы:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Вы сапраўды жадаеце зьмяніць назву групы \"%s\" з панэлі лычак?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Зьмяніць назву групы лычак"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Зьмяніць назву вылучанае групы лычак на:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Малыя значкі"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Паказаць лычкі як малыя значкі"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Вялікія значкі"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Паказаць лычкі як вялікія значкі"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Дадаць групу..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Стварыць новую групу лычак"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Выдаліць групу..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Выдаліць групу лычак"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Зьмяніць назву групы..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Зьмяніць назву групы лычак"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Схаваць панэлю лычак"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Схаваць панэлю лычак"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Стварыць дапомныя _лычкі"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Стварыць дапомныя лычкі"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Зьмяніць назву лычкі"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Зьмяніць назву вылучанай тэчкі на:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Адкрыць тэчку зьвязаную з гэтай лычкай"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Адкрыць у новым акне"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Адкрыць тэчку зьвязаную з гэтай лычкай у новым акне"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Зьмяніць назву лычкі"
+
+#~ msgid "Re_move"
+#~ msgstr "_Выдаліць"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Выдаліць гэтую лычку з панэлі лычак"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Памылка захаваньня лычак."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Лычкаі"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" у \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Надрукаваць агульныя зьвесткі"
+
+#~ msgid "Print summary"
+#~ msgstr "Надрукаваць агульныя зьвесткі"
+
+#~ msgid "Reload"
+#~ msgstr "Перагрузка"
+
+#~ msgid "Reload the view"
+#~ msgstr "Перагрузіць прагляд"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Капіяваць у тэчку..."
 
@@ -19230,25 +19395,10 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Сьпіс адлюстраваных адрэсаў"
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Імпарт LDIF \"Эвалюцыі\""
-
 #, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Імпарт LDIF \"Эвалюцыі\""
 
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "Фармат узаемаабмену даньнямі LDAP (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Імпарт візытовак \"Эвалюцыі\"."
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Імпарт візытовак \"Эвалюцыі\"."
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "Візытоўка (.vcf, .gcrd)"
-
 #~ msgid "Searching..."
 #~ msgstr "Пошук..."
 
@@ -24187,9 +24337,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Appointments"
 #~ msgstr "Сустрэчы"
 
-#~ msgid "No appointments."
-#~ msgstr "Сустрэчы не заплянаваны."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -24580,9 +24727,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Moderate mist"
 #~ msgstr "Умераная дымка"
 
-#~ msgid "Thick mist"
-#~ msgstr "Густая дымка"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Негустая дымка"
 
@@ -24955,9 +25099,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Стварыць новае акно для адлюстраваньня гэтае тэчкі"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Выдаліць гэтую тэчку"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Адлюстраваць іншую тэчку"
 
diff --git a/po/bg.po b/po/bg.po
index d0616e6e47..4ea992a019 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -53,8 +53,7 @@ msgstr "Създава или редактира пощенски акаунти
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -101,20 +100,20 @@ msgstr "Фабрика за контрол на задачи в Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -122,45 +121,45 @@ msgstr "Адресна книга"
 msgid "Delete"
 msgstr "Изтрий"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Нов контакт:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Създай нов контакт"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Нов списък с контакти"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Списък _Контакти"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Създай нов списък с контакт"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Не успях да се свържа с LDAP сървъра."
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -168,33 +167,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Грешка при зареждане информацията за финтъра:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Изчакване ..."
@@ -208,43 +207,45 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Сканира на \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Вернал"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP сървър"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP сървър"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Дата на приключване"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -252,7 +253,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -260,19 +261,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -281,7 +282,7 @@ msgstr ""
 "Не мога да отворя тази адресна книга. Проверете\n"
 "дали пътя съществува и дали имате права за достъп."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -291,7 +292,7 @@ msgstr ""
 "въвели невярно URI, или LDAP сървъра не работи.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -303,7 +304,7 @@ msgstr ""
 "програмата от CVS след като сте изтеглили и инсталирали \n"
 "OpenLDAP от хипервръзката отдолу.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -313,15 +314,15 @@ msgstr ""
 "въвели невярно URI, или LDAP сървъра не работи.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Не мога да отворя адресната книга"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -329,16 +330,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Въведедете парола за %s (потребител %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, което ще се показва в календара"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, което ще се показва в календара"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -383,7 +389,7 @@ msgstr " _Проверка за подържани типове"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -417,20 +423,21 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Източници на адреси"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Източници на адреси"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Източници на адреси"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Източник на Адресна книга"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Аляска"
@@ -442,62 +449,63 @@ msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Connecting"
 msgstr "Концепсион"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Име на списък:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "Тъ_рси"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Група"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Never"
 msgstr "_всеки"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -507,32 +515,32 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Едно"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Обхват на търсенето: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Търся"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Изтрий"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -543,7 +551,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -552,7 +560,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -560,42 +568,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Източник на Информация"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Свързване със сървъра..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Свързване със сървъра..."
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Неподържана схема"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -604,7 +613,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -612,7 +621,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -622,36 +631,37 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -661,7 +671,7 @@ msgstr ""
 "Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
 "се само при показване."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -671,7 +681,7 @@ msgstr ""
 "Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
 "се само при показване."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -679,29 +689,29 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "Using email address"
 msgstr "Това е пощен_ски адрес"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -709,20 +719,20 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Дисплей"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -731,45 +741,45 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Редактирай"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Port number:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Search base:"
 msgstr "Търси в база:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Име на сървъра:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Време за забавяне (минути)"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "cards"
 msgstr "Няма карти"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Отново връзка с %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 #, fuzzy
 msgid "general-tab"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "searching-tab"
 msgstr "Търся"
@@ -899,7 +909,7 @@ msgstr "Сътрудничество"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Редактор за Контакти"
 
@@ -993,10 +1003,10 @@ msgstr "Ка_тегорий..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1048,16 +1058,16 @@ msgid "_Web page address:"
 msgstr "_Web адрес:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "_Адрес:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2051,74 +2061,82 @@ msgid "AOL Instant Messenger"
 msgstr "Предишно Съобщение"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Неименуван Списък с Контакти"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Пощенско Съобщение"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Обслужването е готово"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "_Местонахождение: "
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Потрбителско име:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Домашен"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "Корк"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Друго"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Източник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2126,38 +2144,38 @@ msgstr ""
 msgid "Contact"
 msgstr "Контакти"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Нов Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Виртуални Папки"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Чад"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Потребителско име"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Редактор на категории не е наличен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Този контакт принадлежи на следните категории:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Съхрани Контакт като VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2166,7 +2184,7 @@ msgstr ""
 "Сигурен ли сте, че искате\n"
 "да изтриете този контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2174,49 +2192,54 @@ msgstr ""
 "Сигурен ли сте, че искате\n"
 "да изтриете този контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Работа"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Айдахо"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Група"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не мога да намеря графичен обект за поле: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Бързо добавяне на контакт"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Редактира Пълно"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Пълно Име:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2386,11 +2409,11 @@ msgid "Is New List"
 msgstr "Нов Списък"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Съхрани Списък като VCard"
 
@@ -2486,13 +2509,13 @@ msgid "Email begins with"
 msgstr "завършва с"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорията е"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Кое да е поле съдържа"
 
@@ -2509,108 +2532,108 @@ msgid "Type"
 msgstr "Тип"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Съхрани като VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 #, fuzzy
 msgid "New Contact..."
 msgstr "Нов Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Нов списък с контакти"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Отиди в Папка..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 #, fuzzy
 msgid "Import..."
 msgstr "Внеси..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Тър_си за Контакти"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Източник на Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Настройки за Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Препрати Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Изпрати съобщението на Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Отпечатай"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Печат на Плик"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Отрежи"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Копирай"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 #, fuzzy
 msgid "Current View"
 msgstr "_Текущ Преглед"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2619,8 +2642,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Коя да е категория"
 
@@ -2663,7 +2686,7 @@ msgid "Company Phone"
 msgstr "Телефон на Компания"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2725,7 +2748,7 @@ msgid "Nickname"
 msgstr "Прякор"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Бележка"
 
@@ -2734,7 +2757,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Организация"
 
@@ -2875,68 +2898,74 @@ msgstr "Изтрий"
 msgid "Has Cursor"
 msgstr "Сортиране на Задачи"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Членове"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-поща"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Корк"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Бостън"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Група"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Понце"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Вернал"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Болоня"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Работа:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Домашен Факс"
@@ -2946,8 +2975,8 @@ msgid "Success"
 msgstr "Успешно"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2979,7 +3008,7 @@ msgstr "Протокола на се подържа"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3002,7 +3031,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
-msgid "Addressbook does not exist"
+msgid "Address Book does not exist"
 msgstr "Файлът `%s' не съществува."
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3144,7 +3173,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Добави адрес към вече съществуващия контакт \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Търся в адресната книга..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3204,18 +3234,41 @@ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Помощник за Импортиране на Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Отпечатай избраните контактите"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Отпечатай избраните контактите"
@@ -3308,7 +3361,7 @@ msgstr "Полета"
 msgid "Number of columns:"
 msgstr "Брой колони:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Опций"
 
@@ -3492,8 +3545,8 @@ msgstr "Няма име на файл"
 msgid "Unnamed List"
 msgstr "Неименуван Списък с Контакти"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Въведедете парола"
@@ -3582,10 +3635,9 @@ msgid "Evolution's Tasks component"
 msgstr "Композер на поща за Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Задачи"
 
@@ -3630,26 +3682,24 @@ msgstr "Време за забавяне (минути)"
 msgid "_Edit appointment"
 msgstr "_Редактирай среща"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Отвори"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Отвори"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Няма описание."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3658,12 +3708,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Внимание"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3674,7 +3724,7 @@ msgstr ""
 "по ел. поща все още, но това напомняне е конфигурирано\n"
 "да изпраща поща."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3685,20 +3735,20 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Не мога да инициализирам Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Не мога да инициализирам gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3844,24 +3894,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показвай номерата на седмиците в навигацията за _ден"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Съдържания на Обобщен"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Съдържания на описание"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Съдържание на Коментар"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Несъвпадащ"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3895,7 +3951,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3917,82 +3973,82 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 #, fuzzy
 msgid "New appointment"
 msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 #, fuzzy
 msgid "_Appointment"
 msgstr "Среща"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "Настройки за Източник на Новини"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Среща"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Създава нова задача"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Нова _Среща"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Създай нова папка"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4132,7 +4188,7 @@ msgstr "часове"
 msgid "minutes"
 msgstr "минути"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4206,7 +4262,7 @@ msgid "hour(s)"
 msgstr "час(ове)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "минут(а/и)"
 
@@ -4217,7 +4273,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Разрешен"
 
@@ -4269,7 +4325,7 @@ msgstr "30 минути"
 msgid "60 minutes"
 msgstr "60 минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alerts"
 msgstr "Алберта"
@@ -4295,7 +4351,7 @@ msgid "Days"
 msgstr "Дни"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Раз_решен"
 
@@ -4441,7 +4497,7 @@ msgid "_Fri"
 msgstr "_Пет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Основен"
 
@@ -4538,7 +4594,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "_Списък със задачи"
@@ -4689,23 +4745,23 @@ msgstr "%s  Вие нямате направени промени, да обно
 msgid "Validation error: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " в"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Приключено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Приключено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Дължим"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Дължим"
 
@@ -4742,8 +4798,8 @@ msgstr "Запис в дневник - %s"
 msgid "No summary"
 msgstr "Няма резюме"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Съхрани като..."
 
@@ -4772,11 +4828,21 @@ msgstr "Прекрати действието"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Избор на отдалечена папка за импортиране на тези данни"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "_Списък със задачи"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4884,7 +4950,7 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въведете Делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Среща"
 
@@ -4908,25 +4974,33 @@ msgstr "Разпределение"
 msgid "Meeting"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Начална Дата"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Начало:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Отказан достъп"
@@ -5008,29 +5082,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Без"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
@@ -5233,7 +5307,7 @@ msgstr "на"
 msgid "occurrences"
 msgstr "събития"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Дата/Време:"
@@ -5270,7 +5344,7 @@ msgid "_No recurrence"
 msgstr "_Няма повторение"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Махни"
 
@@ -5313,7 +5387,7 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5340,7 +5414,7 @@ msgstr "Информацията за задачата е променена. Д
 msgid "The task information has changed. Send an updated version?"
 msgstr "Информацията за задачата е променена. Да изпратя ли обновената версия?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Приключено "
@@ -5354,7 +5428,7 @@ msgstr "% Приключено"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Приключено"
 
@@ -5367,7 +5441,7 @@ msgstr "Високо"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "В Прогрес"
 
@@ -5386,7 +5460,7 @@ msgstr "Нормално"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Не е Стартиран"
 
@@ -5428,16 +5502,16 @@ msgstr "Основни"
 msgid "Assignment"
 msgstr "Задача"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не мога да отворя адресната книга"
@@ -5448,7 +5522,7 @@ msgstr "_Конфиденциален"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Описание:"
 
@@ -5642,11 +5716,10 @@ msgstr "Начална Дата"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Резюме"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr " цвят"
@@ -5673,7 +5746,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "И"
 
@@ -5708,10 +5781,10 @@ msgstr "Не"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Неизвестен"
@@ -5724,102 +5797,108 @@ msgstr "Повтарям"
 msgid "Assigned"
 msgstr "Назначен"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Обновява обектите"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Нова _Среща..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Всички Нови _Събития за Деня"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 #, fuzzy
 msgid "New Meeting"
 msgstr "Среща"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Нова Задача"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Печат..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Постави"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Отиди на _Днес"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Потребителска Информация"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Отвори"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Запази като..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "Копирай"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "План на _Среща"
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "Пощенски Настройки..."
@@ -5911,7 +5990,7 @@ msgid "Alarms"
 msgstr "Аларми"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Приключено"
 
@@ -5969,26 +6048,26 @@ msgstr "%02i минутно разделяне"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6182,7 +6261,7 @@ msgid "Send Latest Information"
 msgstr "Изпраща Последната Информация"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Прекръсва"
@@ -6642,12 +6721,12 @@ msgstr "_Приоритет:"
 msgid "Web Page:"
 msgstr "Страница"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Кликнете за да добавите задача"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6655,7 +6734,7 @@ msgid ""
 msgstr "Грешка при стартиране на %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6663,44 +6742,54 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отваряне на задачи в %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Грешка при стартиране на %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Зарежда _Картинки"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Дата на приключване"
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 #, fuzzy
 msgid "Expunging"
 msgstr "Изтриване на папка"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Зарежда _Картинки"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Няма срещи"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Отвори в %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6822,16 +6911,16 @@ msgstr "Информация Свободен/Зает (%s на %s)"
 msgid "iCalendar information"
 msgstr "iКалендарна информация"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Вие трябва да сте участни на събирието."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Въведедете парола за %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6839,7 +6928,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6847,12 +6936,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7041,49 +7130,49 @@ msgstr "Избран месец (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Задача"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Печат на Обект"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Печатни Настройки..."
 
@@ -7092,40 +7181,40 @@ msgstr "Печатни Настройки..."
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 #, fuzzy
 msgid "New task"
 msgstr "Нова Задача"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Задачи"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "_Списък със задачи"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "_Списък със задачи"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7189,22 +7278,22 @@ msgstr "Съобщение на Календар"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Папката съдържа срещи и събития"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Напомня"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Съобщение на Календар"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7213,7 +7302,7 @@ msgstr ""
 "Evolution намери пощенски файлове на Pine.\n"
 "Искате ли те да бъдат импортиране в Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Календар"
@@ -8882,7 +8971,7 @@ msgstr "Не мога да отворя съобщение"
 msgid "Failed on message %d"
 msgstr "Грешка на съобщение %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Синхронизиране на папка"
 
@@ -8972,7 +9061,7 @@ msgstr "Копиране на съобщението в %s"
 msgid "Filtering new message(s)"
 msgstr "Получавам %d съобщение"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8980,47 +9069,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Прекратено."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочакван отговор от POP сървър: %s"
 
-#: camel/camel-gpg-context.c:814
-#, fuzzy
-msgid "No data provided"
-msgstr "Няма име на файл"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Не мога да криптирам това съобщение: няма зададен получател"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9028,62 +9112,62 @@ msgid ""
 "%s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Това е част от криптирано съобщение"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Съдържанието на съобщенията"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Не мога да получа съобщение от редактора"
@@ -9197,21 +9281,34 @@ msgstr ""
 msgid "parse error"
 msgstr "Друга грешка"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Не мога да заредя %s: Зареждаемият модул не се подържа от тази система"
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не мога да заредя %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не мога да заредя %s: Няма инициализиращ код в модула."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Няма наличен доставчик за протокол `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Анонимно"
@@ -9361,7 +9458,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Грешна оторизация отговори сървъра."
 
@@ -9500,20 +9597,7 @@ msgstr "Търсенето на хост пропадна: %s: хоста не �
 msgid "Host lookup failed: unknown reason"
 msgstr "Търсенето на хост пропадна: %s: неизвестна причина"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Няма наличен доставчик за протокол `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9583,21 +9667,25 @@ msgstr "Сървър:%s, Тип: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не мога да взема папката. Грешна операция за това хранилище"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не мога да създам папката: Грешна операция за това хранилище"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не мога да изтрия папка %s: Грешна операция"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Кошче"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9828,21 +9916,31 @@ msgstr "Няма такова съобщение: %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не мога да преименувам папката %s Грешна операция"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не мога да преименувам папката %s Няма такава папка"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Вие не може да копирате съобщения от тази папка боклук"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Вие не може да копирате съобщения от тази папка боклук"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9859,16 +9957,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Автоматична проверка за нов email"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Адресна книга"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9888,68 +9981,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Парола"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "По подразбиране"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Гъста мъгла"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Действието прекратено"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сървъра неочаквано се откачи: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr "Неочакван отговор от IMAP сървър: %s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неочакван отговор от IMAP сървър: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Отговора на сървъра завърши твърде бързо"
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неочакван OK от IMAP сървър: %s"
@@ -9964,7 +10055,7 @@ msgstr "Не мога да създам директория %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Не мога да заредя обобщение за %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Папката е била разрушена и пресъздадена на сървъра."
 
@@ -9973,12 +10064,12 @@ msgstr "Папката е била разрушена и пресъздаден�
 msgid "Scanning for changed messages"
 msgstr "Сканирам за променени съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9994,25 +10085,25 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Съобщението не е налично"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Извличам обобщена информация за нови съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Не мога да намеря тялото на съобщението в FETCH отговора."
 
@@ -10072,27 +10163,37 @@ msgstr "Място за име"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Проврка за нови съобщения във всички папки"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Проврка за нови съобщения във всички папки"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s услуга за %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10101,68 +10202,68 @@ msgstr "%s услуга за %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не мога да се свържа към  %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Операцията не се подържа"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Оторизацията пропадна"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не мога да се свържа към сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сървър %s не подържа заявената оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Вие не сте въвели парола."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10173,24 +10274,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "В името на папката не може да се съдържа символа 'Return'"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "На бащината папка не е разрешено да има подпапки"
 
@@ -10212,7 +10321,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Не мога да се свържа към POP сървър %s."
@@ -10294,8 +10403,8 @@ msgid ""
 msgstr "За четене и съхранение на локална поща в стандартен mbox spool файлове"
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10307,55 +10416,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Локални запазвания няма в inbox"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локален mail файл %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Не мога да изтрия файл с обобщение за папка `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Не мога да запазя обобщение %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не мога да добавя съобщение към обобщение: неизвестна причина"
 
@@ -10373,53 +10482,44 @@ msgstr "Не мога да добавя съобщението в maildir пап
 msgid "Invalid message contents"
 msgstr "Грешно съдържание на съобщение"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Не мога да отворя папката `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Папката `%s' не съществува."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Не мога да създам папка`%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' не е maildir директория."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не мога да изтрия папката `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "не е maildir директория"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10445,9 +10545,9 @@ msgid "Checking for new messages"
 msgstr "Сканирам за нови съобщения"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Запазва папка"
@@ -10491,159 +10591,137 @@ msgstr "Папката изглежда да е невъстановимо по�
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Конструирането на съобщението пропадна: Повреден mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Не мога да отворя файл `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Не мога да създам папка с това име"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Не мога да създам директория %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Не мога да прикача файл %s: не е обикновен файл"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Не мога да създам файл `%s':\n"
+"Не мога да изтрия папката `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' не е обикновен файл."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Не мога да изтрия папката `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папката `%s' не е празна. Не е изтрита."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Не мога да създам папка с това име"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Не мога да създам директория %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Карта ID вече съществува"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Указаното име на папка е невалидно: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не мога да отворя папката `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатална грешка в пощата близо до %ld в папка %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не мога да проверя папката `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не мога да отворя файл `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не мога да отворя временния mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не мога да затворя папката източник %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не мога да затворя временната папка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Обобщението и папката са объркани дори след синхронизация"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Грешка при писане в временния mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Писането в временния mailbox неуспешен: %s: %s"
@@ -10657,10 +10735,17 @@ msgstr "Прекъсна добавяне на MH съобщение"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Не мога да създам папка`%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' не е директория."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Не мога да получа папка: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10682,6 +10767,29 @@ msgstr "`%s' не е maildir директория."
 msgid "Folder `%s/%s' does not exist."
 msgstr "Папката `%s/%s' не съществува."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Не мога да отворя папката `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Папката `%s' не съществува."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Не мога да създам папка`%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
@@ -10916,48 +11024,48 @@ msgstr "Не мога да преименувам папката %s на %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Не мога да преместя папка в една от нейните подпапки."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Не мога да създам програмен канал: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Не мога да получа съобщение: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Сканирам за нови съобщения"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 #, fuzzy
 msgid "Use cancel"
 msgstr "Прекръсва"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Действието прекратено"
@@ -11005,7 +11113,7 @@ msgstr "Изтрива след %s дни"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11095,7 +11203,7 @@ msgid "No such folder `%s'."
 msgstr "Няма такава папка `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11150,7 +11258,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Изпращане на поща през програмата sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11324,7 +11432,7 @@ msgstr "SMTP поща през %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
@@ -11437,34 +11545,34 @@ msgstr "AUTH заявка по таймаут: %s"
 msgid "QUIT response error"
 msgstr "RSET върна грешка: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "прикачен"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Изтрива избраните обекти от списъка на прикачени"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Добавя Прикачен...."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Прикрепи файл към съобщението"
 
@@ -11589,20 +11697,20 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Attach file(s)"
 msgstr "Прикрепи файл"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11611,30 +11719,30 @@ msgstr ""
 "Грешка при четеен на файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Файла съществува. Да го презапиша?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Грешка при съхранението на файл: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Грешка при зареждането на файл: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Грешка при достъп на файл: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Не мога да получа съобщение от редактора"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11643,7 +11751,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11652,7 +11760,7 @@ msgstr ""
 "Не мога да отрежа файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11661,7 +11769,7 @@ msgstr ""
 "Не мога да намеря във файл %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11670,7 +11778,7 @@ msgstr ""
 "Грешка при автоматичното запазване на файл: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11679,7 +11787,7 @@ msgstr ""
 "Ximian Evolution намери незапазени файлове от предишната сесия.\n"
 "Искате ли да се опитам да ги възстановя?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11690,50 +11798,50 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Отвори файл"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Запазва сигнатура"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Напиши Съобщение"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11741,13 +11849,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12106,7 +12214,7 @@ msgstr "Тогава"
 msgid "You must specify a folder."
 msgstr "Име на стил:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Избери Папка"
@@ -12121,20 +12229,20 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
 msgstr "Того"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
 msgstr "след"
@@ -12227,7 +12335,7 @@ msgstr ""
 "Времето на съобщението ще бъде сравнено\n"
 "с времето което сте задали тук."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Виртуални Папки"
 
@@ -12243,7 +12351,7 @@ msgstr "преди"
 msgid "months"
 msgstr "месеци"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "секунди"
 
@@ -12420,7 +12528,7 @@ msgstr "Маркирано"
 msgid "Junk Test"
 msgstr "Юни"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12535,9 +12643,10 @@ msgstr "започва с"
 msgid "Stop Processing"
 msgstr "Прекрати Обработката"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Тема"
 
@@ -12546,25 +12655,25 @@ msgstr "Тема"
 msgid "Unset Status"
 msgstr "Задава статус"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Правила"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Добави Правило"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Редактиране на Правило"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Име на правило:"
@@ -12605,15 +12714,15 @@ msgstr "Темата съдържа"
 msgid "Subject does not contain"
 msgstr "Темата несъдържа"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Тази vпапка трябва да има име."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Необходимо е да зададете поне една папка като източник"
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "Източници на vПапки"
@@ -12671,9 +12780,9 @@ msgstr "Компонент на Evolution за показване на поще�
 msgid "Evolution Mail preferences control"
 msgstr "Компонент на Evolution за показване на пощенски папки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Поща"
 
@@ -12682,7 +12791,7 @@ msgstr "Поща"
 msgid "Mail Accounts"
 msgstr "Акаунти"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12726,17 +12835,17 @@ msgstr "Име на стил:"
 msgid "[script]"
 msgstr "Няма Описание"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Език"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 #, fuzzy
 msgid "Add script signature"
 msgstr "Добави критерии"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Файл с Подпис:"
@@ -12820,7 +12929,6 @@ msgid "Unread messages"
 msgstr "Следващо Непрочетено Съобщение"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<натиснете тук за да изберете папка>"
 
@@ -12829,411 +12937,430 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Create New Folder"
 msgstr "Създай нова папка..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Укажете каде да бъде създадена папката:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Име на папка:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Зареждам"
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Избери папка"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Създай нова папка"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Не мога да изтрия папката `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Не мога да изтрия папка %s: Няма такава папка"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Не мога да изтрия папката:\n"
 "%s"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Изтрий \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Не мога да преименувам папката %s Няма такава папка"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименувай папката \"%s\" на:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Преименувай папка"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Отвори в Нов Прозорец"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Премести"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова папка"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Преименува"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Свойства..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Редактирай като ново съобщение..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "Печат"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Отговори на списъка"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Отговори на всички"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Препрати"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Приключено"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Изчисти"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Отбележи: прочетено"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Маркирай като Не_важни"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Възстанови изтрито"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Премести в Папка..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Копирай в Папка..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Добави подателя в адресната книга"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Приложи Филтри"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Създай правило от съобщението"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder върху _Тема"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "v_Папка на Получатели"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Филтър върху _Mailing List"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Филтър върху Т_ема"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Филтър върху Из_пращач"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Филтър върху По_лучатели"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Филтър върху Mailing _List"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Филтър върху Из_пращач"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "По подразбиране"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Отпечатай Съобщението"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Копира местоположениет на указател"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Кликнете за да добавите задача"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Съвпадения:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Назначен"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 "повече информация."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Добави критерии"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Добави критерии"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Прекъснат"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP криптиране"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Сертифициран ID:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Съобщението не е налично"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "П_ресрочени задачи:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Работа в 'O_nline' "
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Скрий"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
@@ -13277,29 +13404,34 @@ msgstr "Указател към неизвестни външни данни (\"
 msgid "Formatting message"
 msgstr "Премести съобщения"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "От"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13316,8 +13448,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "Дата"
 
@@ -13335,21 +13467,26 @@ msgstr "Не мога да анализирам MIME съобщение. Пок�
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Неподържана схема"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неуспех при проверка на сертификати"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Неуспех при проверка на сертификати"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13361,60 +13498,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Съхрани Като..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Неименувано Съобщение"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "_Отвори Указател в Браузер"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Изпраща с_ъобщението към списък..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Добави адресна книга"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори в %s..."
@@ -13464,18 +13601,18 @@ msgstr "Филтри"
 msgid "-------- Forwarded Message --------"
 msgstr "Препратени съобщения"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13484,7 +13621,7 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13493,32 +13630,38 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Съобщение"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Spool `%s' не съществува или не е обикновен файл"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Съхрани Съобщението Като..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "_Адрес:"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mail от %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не мога да създам временна директория: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13532,7 +13675,7 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13561,320 +13704,328 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Отрязва избраните съобщения"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Отрязва избраните съобщения"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Отрязва избраните съобщения"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Отрязва избраните съобщения"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Превключи показването на панела с папките"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Превключи показването на панела с папките"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Изпразва кошчето при излизане"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Изпразва кошчето при излизане"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Изпрати съобщението по-късно"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Акаунти"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Mail Конфигурация"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Mail Конфигурация"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Изпрати mail в HTML формат по подразбиране."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Изпрати mail в HTML формат по подразбиране."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Покажи Времето Като"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Покажи Времето Като"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Показва съобщение в нормален стил"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Предварителен преглед на Pane"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Оригинален Контакт:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13882,176 +14033,173 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Изпрати съобщението по-късно"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Изпрати съобщението по-късно"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Прави това моя подразбиращ се акаунт"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Променливо"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Вмъкни"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Elm importer"
 msgstr "Композер на поща за Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Композер на поща за Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Композер на поща за Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Композер на поща за Evolution."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution импортира вашите стари Elm пощи"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Импортира..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Моля почакайте"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Импортира %s като %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканира на \"%s\""
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Импортира Файлове"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -14059,16 +14207,44 @@ msgstr ""
 "Evolution намери пощенски файлове на Elm\n"
 "Искате ли да ги импортирате в Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Изтрий тази папка"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Импортира"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Импортира Файлове"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканира на \"%s\""
+
+#: mail/importers/netscape-importer.c:72
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Приоритет: %s"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14083,7 +14259,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14091,7 +14267,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14100,33 +14276,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#: mail/importers/netscape-importer.c:1995
+#: mail/importers/netscape-importer.c:1677
 #, fuzzy
-msgid "Scanning mail filters"
-msgstr "Локален mail файл %s"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Сканира директория"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Стартира импорт"
+msgid "Importing Netscape data"
+msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Настройки"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Редактирай Филтри"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14134,11 +14302,20 @@ msgstr ""
 "Evolution намери пощенски файлове на Netscape.\n"
 "Искате ли те да бъдат импортиране в Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution импортира вашите стари Pine данни"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Импортира Файлове"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Адресна книга"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14146,7 +14323,7 @@ msgstr ""
 "Evolution намери пощенски файлове на Pine.\n"
 "Искате ли те да бъдат импортиране в Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14192,20 +14369,20 @@ msgid "You have not filled in all of the required information."
 msgstr "Вие не сте попълнили всичи полета за необходимата информация."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Редактор на Акаунти в Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Хост:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Потрбителско име:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Път:"
 
@@ -14254,29 +14431,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Ново _Mail съобщение"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Пощенско Съобщение"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Напиши Съобщение"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Нов VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Редактирай Филтри"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Създай нова папка"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, което ще се показва в календара"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Потребител"
 
@@ -14325,7 +14517,7 @@ msgstr ""
 "сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Мениджър на Акаунт"
 
@@ -14354,130 +14546,126 @@ msgid "Connecting to server..."
 msgstr "Свързване със сървъра..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Проверка за подържани типове"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL не се подържа в тази версия на evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL не се подържа в тази версия на evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Винаги се самокриптира при изпращане на криптирана поща"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "Акаунт %d"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Account Информация"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Добави критерии"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Запазва сигнатура"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Винаги се самокриптира при изпращане на криптирана поща"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Прикрепи файл към съобщението"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прикачен"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Удостоверение"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Неизвестна кодова таблица: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Затвори"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Проверка за Нов email"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Проверка за Нов email"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Цвят на задачи за деня"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Напиши Съобщение"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14494,343 +14682,339 @@ msgstr ""
 "\n"
 "Кликнете на \"Завърши\" за да запазите настройките."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "По Подразбиране"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Дел Бажио"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Подразбираща се кодова таблица:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Приключено"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Папки _Черова"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Адресът за ел. поща съдържа"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Адрес на ел. поща"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Изпразва кошчето при излизане"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Сертифициран ID:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за Акаунти"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Изпълнява действия"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "завършва с"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Опций"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Свойства"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Препратени съобщения"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Начало"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Подсветнато цитиране с"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Съхрани и Затвори"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Зарежда _Картинки"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Mail Конфигурация"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Местоположение на Пощенската кутия"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Съобщения"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Показване на _Съобщение"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Съобщението съдържа"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail Конфигурация"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Опционална Информация"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Организа_ция:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Ключ ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Избери цвят"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Пита когато се изпраща поща само с получатели в полето _Bcc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PGP"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Отпечатай избраните контактите"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Пощенска директория Qmail"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Запомни тази парол_а"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Отговор-До:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Опции на Получаване"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Запомни тази парола"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "изискана Информация"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "По подразбиране"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Сигурност"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Защитен MIME"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Изпати _папка със съобщения:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Изпрати и Чернова Съобщение"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Сървърът изисква ото_ризация"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Сървър Конфигурация"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Тип С_ървър:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Конфигурационната база данни не е намерена"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Име на стил:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Променливо"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -14841,199 +15025,199 @@ msgstr ""
 "\n"
 "Кликнете на \"Следващ\" за да започнете."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Файл с Подпис:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Винаги отказва да зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Тип на Идентифика_ция:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Тип на Идентифика_ция:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Автоматична проверка за нов email"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Автоматична проверка за нов email"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Подтвърждение при редактиране на папка"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML сигнатура:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "По подразбиране"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Разрешава"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Препрати Като"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Пълно Име:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "В HTML поща"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Потребител"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Юни"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Зарежда картинки ако изпращача е в адресната книга"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Прави това моя подразбиращ се акаунт"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Маркир_ай съобщенията като \"Прочетени\" след:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Име:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Никога не зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Пита при изпращане на HTML съобщения до контакти които не я искат"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Пита пр_и изпращане на поща без тема"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Отговори на Всички"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Сигурност"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Изтрии..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Покажи Времето Като"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Файл с Подпис:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Оригинален Контакт:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Изплзва криптирана връзка (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Сканира на \"%s\""
@@ -15056,7 +15240,7 @@ msgstr ""
 "Грешка при извършване на операция:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Работи"
 
@@ -15068,128 +15252,128 @@ msgstr "Филтър върху папка"
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Изпращане на \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Грешка на съобщение %d от %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импортира %s като %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15198,7 +15382,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15207,11 +15391,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15220,22 +15404,22 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15270,39 +15454,39 @@ msgstr "Изключения"
 msgid "Security Information"
 msgstr "Източник на Информация"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Прекратяване..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сървър:%s, Тип: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Път: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Изпращане и Получаване на поща"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Прекъсва Всичко"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Обновяване ..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
@@ -15410,20 +15594,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Опит за редактиране на vпапка '%s' която не съществува."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
@@ -15769,103 +15953,20 @@ msgstr "Спациални Папки"
 msgid "Autocompletion Folders"
 msgstr "Дата на приключване"
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Не мога да проверя папката `%s': %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"Не мога да преименувам папката:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Не мога да преместя папка въру себе си."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Не мога да копирам директорията върху себе си."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Не мога да преместя папка в една от нейните подпапки."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Задайте папка за копиране на папка \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Копирай папка"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Задайте папка за да преместите в нея \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Премести папка"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Не мога да изтрия папката:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-"Не мога да изтрия папката:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Не мога да преименувам папката:\n"
+"Не мога да създам указаната папка:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Указаното име на папка е невалидно: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Не мога да преименувам папката:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Не мога да създам указаната папка:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Неименуван)"
@@ -16007,7 +16108,7 @@ msgstr "Неуспех при декодиране на съобщението"
 msgid "_Import"
 msgstr "Вмъкни"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Затварям връзката..."
 
@@ -16051,6 +16152,10 @@ msgstr ""
 "Не мога да създам указаната папка:\n"
 "%s"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Стартира импорт"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16163,130 +16268,6 @@ msgstr "Конфигурационната база данни не е наме�
 msgid "Generic error"
 msgstr "Генерира грешка"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Създава нова група препратка"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Име на група:"
-
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Действително ли искате да изтриете група\n"
-"`%s' от лентата с препратки?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Преименува Група Препратка"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Преименува избраната група препратка на:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Малки Икони"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Показва препратки като малки икони"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Го_леми Икони"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Показва препратки като големи икони"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "_Нова Група..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Създава нова група препратка"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "П_ремахни тази Група..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Премахва тази група препратка"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "П_реименува тази Група..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Преименува тази група препратка"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "С_крива лентата с препратки"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Скрива лентата с препратки"
-
-#: shell/e-shortcuts-view.c:288
-#, fuzzy
-msgid "Create _Default Shortcuts"
-msgstr "Създай нова препратка"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "Create Default Shortcuts"
-msgstr "Създай нова препратка"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Преименува препратка"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Преименува избраната препратка на:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Отваря папката свързана с тази препратка"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "_Отвори в Нов Прозорец"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Отваря папка свързана с тази препратка в нов прозорец"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Преименуваи тази препратка"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Пр_емахни"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Изтрива тази препратка от лентата с препратки"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Грешка при запазване на препратки."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Препратки"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -16298,11 +16279,6 @@ msgstr "Чико"
 msgid "New"
 msgstr "Нов"
 
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Отвори в %s..."
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16600,57 +16576,57 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Избери Папка"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Прогрес"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Израз"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрес на ел. поща"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "_Сертифициран ID:"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Въведедете парола за %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16717,7 +16693,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Сертифициран ID:"
@@ -16792,11 +16768,11 @@ msgstr "Организация"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16844,243 +16820,243 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Карта ID вече съществува"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Върмонт"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Върмонт"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Върмонт"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Върмонт"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "С"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "С"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "1-ви"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Публичен Ключ: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Темата е %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Не мога да обработя spool папка"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Неуспех при проверка на сертификати"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "входящ"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Няма Информация"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "прикачен"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Сертифициран ID:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Куритиба"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Северна Каролина"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Израз"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s в %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Файл с Подпис:"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Вмъква"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Темата е %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Файл с Подпис:"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Въведедете парола за %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Сертифициран ID:"
@@ -17703,7 +17679,7 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "A_dd Sender to Addressbook"
+msgid "A_dd Sender to Address Book"
 msgstr "Добави подателя в адресната книга"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17713,7 +17689,7 @@ msgstr "Приложи Филтри"
 
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
-msgid "Add Sender to Addressbook"
+msgid "Add Sender to Address Book"
 msgstr "Добави подателя в адресната книга"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18188,10 +18164,6 @@ msgstr "_Формат"
 msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Отвори"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Отвори файл"
@@ -18573,22 +18545,6 @@ msgstr "Изпращане / Получаване"
 msgid "_Window"
 msgstr "Намери Сега"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Печат на Обобщение"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Печат на Резюмето"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Презарежда"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Презарежда Прегледа"
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -18663,8 +18619,8 @@ msgstr "С Категория"
 msgid "_Tasks"
 msgstr "_Задачи"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18921,25 +18877,25 @@ msgstr "Търсене"
 msgid "_Find Now"
 msgstr "Намери Сега"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Изчисти"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 #, fuzzy
 msgid "Text"
 msgstr "Тест"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Намери Сега"
@@ -18954,6 +18910,220 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% приключено)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Източници на адреси"
+
+#, fuzzy
+#~ msgid "No data provided"
+#~ msgstr "Няма име на файл"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да отворя файл `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да създам директория %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да създам файл `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' не е директория."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Импортира %s като %s"
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "Локален mail файл %s"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Сканира директория"
+
+#, fuzzy
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Не мога да проверя папката `%s': %s"
+
+#, fuzzy
+#~ msgid "Cannot move folder: %s"
+#~ msgstr ""
+#~ "Не мога да преименувам папката:\n"
+#~ "%s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Не мога да преместя папка въру себе си."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Не мога да копирам директорията върху себе си."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Не мога да преместя папка в една от нейните подпапки."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Задайте папка за копиране на папка \"%s\":"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Копирай папка"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Задайте папка за да преместите в нея \"%s\":"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Премести папка"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да изтрия папката:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr ""
+#~ "Не мога да изтрия папката:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да преименувам папката:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да преименувам папката:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Създава нова група препратка"
+
+#~ msgid "Group name:"
+#~ msgstr "Име на група:"
+
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Действително ли искате да изтриете група\n"
+#~ "`%s' от лентата с препратки?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Преименува Група Препратка"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Преименува избраната група препратка на:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Малки Икони"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Показва препратки като малки икони"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Го_леми Икони"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Показва препратки като големи икони"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "_Нова Група..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Създава нова група препратка"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "П_ремахни тази Група..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Премахва тази група препратка"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "П_реименува тази Група..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Преименува тази група препратка"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "С_крива лентата с препратки"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Скрива лентата с препратки"
+
+#, fuzzy
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Създай нова препратка"
+
+#, fuzzy
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Създай нова препратка"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Преименува препратка"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Преименува избраната препратка на:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Отваря папката свързана с тази препратка"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "_Отвори в Нов Прозорец"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Отваря папка свързана с тази препратка в нов прозорец"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Преименуваи тази препратка"
+
+#~ msgid "Re_move"
+#~ msgstr "Пр_емахни"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Изтрива тази препратка от лентата с препратки"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Грешка при запазване на препратки."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Препратки"
+
+#, fuzzy
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "Отвори в %s..."
+
+#~ msgid "Print Summary"
+#~ msgstr "Печат на Обобщение"
+
+#~ msgid "Print summary"
+#~ msgstr "Печат на Резюмето"
+
+#~ msgid "Reload"
+#~ msgstr "Презарежда"
+
+#~ msgid "Reload the view"
+#~ msgstr "Презарежда Прегледа"
+
 #, fuzzy
 #~ msgid "Copy to folder..."
 #~ msgstr "Копирай в Папка..."
@@ -19575,21 +19745,9 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Друг Адрес"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Помощник за Импортиране на Evolution"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Помощник за Импортиране на Evolution"
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Композер на поща за Evolution."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Композер на поща за Evolution."
-
 #~ msgid "Searching..."
 #~ msgstr "Търся..."
 
@@ -25022,10 +25180,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Appointments"
 #~ msgstr "Срещите"
 
-#, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Няма срещи"
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -25279,9 +25433,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Moderate mist"
 #~ msgstr "Умерена мъгла"
 
-#~ msgid "Thick mist"
-#~ msgstr "Гъста мъгла"
-
 #~ msgid "Mist with wind"
 #~ msgstr "Мъгла с вятър"
 
@@ -25518,9 +25669,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Създай нова папка"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Изтрий тази папка"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Покажи друга папка"
 
diff --git a/po/ca.po b/po/ca.po
index 2608b2d838..c6464298b9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,14 +9,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 15:07+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-08 22:02+0100\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"
 
 #: addressbook/conduit/address-conduit.c:272
@@ -49,7 +49,6 @@ msgstr "Configureu el completat automàtic"
 #. 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:363
@@ -92,21 +91,21 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Se suprimirà la llista de tasques '%s'. Esteu segur de voler continuar?"
 
-#: addressbook/gui/component/addressbook-component.c:270
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "New Address Book"
 msgstr "Llibreta d'adreces nova"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -114,60 +113,60 @@ msgstr "Llibreta d'adreces nova"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Contacte nou"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contacte"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Crea un contacte nou"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Llista de contactes nova"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Llista de contactes"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Crea una llista de contactes nova"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "S'ha produït un error en connectar amb el servidor d'LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "S'ha produït un error en autenticar-se al servidor d'LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Aquest servidor no suporta l'informació de l'esquema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "S'ha produït un error en recuperar la informació de l'esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Els servidor no ha contestat amb una informació de l'esquema vàlida"
 
@@ -191,20 +190,18 @@ msgid "Migrating `%s':"
 msgstr "S'està migrant \"%s\":"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "En aquest ordinador"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personal"
 
@@ -343,7 +340,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -390,7 +387,7 @@ msgid "Address Book Sources"
 msgstr "Fonts de la llibreta d'adreces"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Sempre"
 
@@ -445,7 +442,7 @@ msgid "Group:"
 msgstr "Grup:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Mai"
 
@@ -638,7 +635,7 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Sempre que sigui possible"
 
@@ -662,7 +659,7 @@ msgstr "Límit de baixa_da:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -818,7 +815,7 @@ msgstr "Col·laboració"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
@@ -907,10 +904,10 @@ msgstr "_Categories..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2200
-#: mail/em-folder-view.c:773 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -958,15 +955,15 @@ msgid "_Web page address:"
 msgstr "Adreça de pàgina _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adreça"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1969,102 +1966,111 @@ msgid "AOL Instant Messenger"
 msgstr "Missatgeria instantània de l'AOL"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2852
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Servei"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Ubicació"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2542
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Particular"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Feina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2543
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Contacte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Canviat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1461
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "L'editor de categories no està disponible"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1469
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Aquest contacte pertany a aquestes categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1692
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2072,52 +2078,57 @@ msgstr ""
 "Esteu segur de voler\n"
 "suprimir aquests contactes?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Esteu segur de volernsuprimir aquest contacte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2541
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2851
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2853
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2854
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3142
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Nom compl_et:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:309
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "Adreça de correu electrò_nic:"
 
@@ -2367,13 +2378,13 @@ msgid "Email begins with"
 msgstr "El correu electrònic comença amb"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoria és"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualsevol camp conté"
 
@@ -2394,96 +2405,96 @@ msgstr "Tipus"
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Contacte nou..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Llista de contactes nova..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Vés a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Fonts de la llibreta d'adreces..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Paràmetres del Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Envia un missatge al contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Imprimeix el sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Talla"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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 "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
 #: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Vista actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2492,8 +2503,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
@@ -2536,7 +2547,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Adreça de correu electrònic"
 
@@ -2600,7 +2611,7 @@ msgid "Nickname"
 msgstr "_Sobrenom:"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
@@ -2611,7 +2622,7 @@ msgid "Office"
 msgstr "_Oficina"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organització"
 
@@ -2755,69 +2766,75 @@ msgstr "Suprimeix"
 msgid "Has Cursor"
 msgstr "Tasques"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "desembre"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Adreça de correu electrònic"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Feina"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Descripció:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grup"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "per sempre"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Càrrec:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax particular"
@@ -3082,18 +3099,18 @@ msgstr "Cotxe"
 msgid "GTK Tree View"
 msgstr "Setmana"
 
-#: 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
 #, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3125,12 +3142,12 @@ msgstr ""
 msgid "Print envelope"
 msgstr "Imprimeix el sobre"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Imprimeix el contacte"
 
@@ -3222,7 +3239,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcions"
 
@@ -3405,8 +3422,8 @@ msgstr "No s'ha proporcionat cap nom de fitxer."
 msgid "Unnamed List"
 msgstr "Llista sense nom"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
@@ -3496,7 +3513,7 @@ msgid "Evolution's Tasks component"
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3761,26 +3778,33 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Mostra els números de les setmanes"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 #, fuzzy
 msgid "Summary contains"
 msgstr "conté"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 #, fuzzy
 msgid "Description contains"
 msgstr "Descripció:"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 #, fuzzy
 msgid "Comment contains"
 msgstr "conté"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Descripció:"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3808,12 +3832,8 @@ 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/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3837,81 +3857,81 @@ msgstr "%A, %d de %B de %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Visualitza tots els contactes"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crea un nou contacte"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Visualitza tots els contactes"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Agenda"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Crea una nova agenda"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4062,7 +4082,7 @@ msgstr "hores"
 msgid "minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4144,7 +4164,7 @@ msgid "hour(s)"
 msgstr "hores"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -4157,7 +4177,7 @@ msgstr "Edita una cita"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
@@ -4213,7 +4233,7 @@ msgstr "30 minuts"
 msgid "60 minutes"
 msgstr "60 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmes"
@@ -4242,7 +4262,7 @@ msgid "Days"
 msgstr "Dies"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
@@ -4398,7 +4418,7 @@ msgid "_Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4716,7 +4736,7 @@ msgid "No summary"
 msgstr "Sense resum"
 
 #: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1144
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
@@ -4913,25 +4933,33 @@ msgstr "Seleccioneu una carpeta"
 msgid "Meeting"
 msgstr "Cancel·lat"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Permís denegat"
@@ -5014,36 +5042,31 @@ msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
 #. 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:591 composer/e-msg-composer.c:2082
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:782
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -5255,7 +5278,7 @@ msgstr "mes"
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data d'enviament"
@@ -5295,7 +5318,7 @@ msgid "_No recurrence"
 msgstr "Sense recurrència"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 #, fuzzy
 msgid "_Remove"
 msgstr "Elimina"
@@ -5340,7 +5363,7 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1561
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5365,7 +5388,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "% comp_let:"
@@ -5456,16 +5479,16 @@ msgstr "Enganxa"
 msgid "Assignment"
 msgstr "Assigna una puntuació"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es pot obrir la llibreta d'adreces"
@@ -5477,7 +5500,7 @@ msgstr "Confidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descripció:"
 
@@ -5685,7 +5708,7 @@ msgstr "Data d'ini_ci:"
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr "Colors"
@@ -5749,10 +5772,10 @@ msgstr "Ara"
 #: 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:1673 camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconegut"
@@ -5831,14 +5854,14 @@ msgstr "_Publica la informació lliure/ocupat"
 
 #: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
 #: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:748 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
 #: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:750 mail/em-popup.c:689 mail/em-popup.c:804
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
@@ -5852,7 +5875,7 @@ msgstr "Re_talla"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5961,7 +5984,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Acabat"
 
@@ -5990,20 +6013,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -6027,33 +6042,26 @@ msgstr "%02i divisions de minut"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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-top-item.c:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6235,7 +6243,7 @@ msgid "Send Latest Information"
 msgstr "Envia l'última informació"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel·la"
@@ -6602,10 +6610,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-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
@@ -6614,10 +6618,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:1606
 msgid "%m/%d/%Y"
@@ -6701,12 +6701,12 @@ msgstr "Prioritat:"
 msgid "Web Page:"
 msgstr "Pàgina web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliqueu per obrir %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6716,7 +6716,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1949
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6727,12 +6727,12 @@ msgstr ""
 "%s\n"
 " ha fallat."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan obrint les tasques a %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6741,38 +6741,38 @@ msgstr ""
 "S'ha produït un error en obrir %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "S'estan carregant les tasques"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "S'estan acabant les tasques..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "S'estan suprimint els objectes seleccionats..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "S'està ampliant"
 
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1751
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "S'estan carregant les tasques"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1763
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/gnome-cal.c:1808
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
-#: calendar/gui/gnome-cal.c:1957
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6783,7 +6783,7 @@ msgstr ""
 "%s\n"
 " ha fallat."
 
-#: calendar/gui/gnome-cal.c:2812
+#: calendar/gui/gnome-cal.c:2799
 msgid "Purging"
 msgstr "S'està eliminant"
 
@@ -6894,11 +6894,11 @@ msgstr "Informació lliure/ocupat (%s a %s)"
 msgid "iCalendar information"
 msgstr "Informació de l'iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Heu d'assistir a l'esdeveniment."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Introduïu la contrasenya de %s"
@@ -8942,7 +8942,7 @@ msgstr "No es pot obrir el missatge"
 msgid "Failed on message %d"
 msgstr "S'ha produït un error en el missatge %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "S'està sincronitzant la carpeta"
 
@@ -8968,7 +8968,7 @@ msgstr "Els arguments per a (marca-sistema) no és vàlid"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Els arguments per a (etiqueta-usuari) no és vàlid"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "S'ha produït un error en executar la cerca de filtres: %s. %s"
@@ -9055,9 +9055,9 @@ msgstr ""
 "Us cal una frase secreta per desbloquejar la clau\n"
 "per a l'usuari: '%s'"
 
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1271
-#: camel/camel-gpg-context.c:1430 camel/camel-gpg-context.c:1516
-#: camel/camel-gpg-context.c:1623 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Cancel·lat."
 
@@ -9072,15 +9072,11 @@ msgstr ""
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada del GnuPG: %s"
 
-#: camel/camel-gpg-context.c:815
-msgid "No data provided"
-msgstr "No s'ha proporcionat cap dada"
-
-#: camel/camel-gpg-context.c:855
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No s'ha pogut xifrar perquè no s'ha especificat cap destinatari vàlid"
 
-#: camel/camel-gpg-context.c:1132
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9091,34 +9087,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1137
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "No s'ha pogut signar %s amb el GPG: %s\n"
 
-#: camel/camel-gpg-context.c:1250 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "No s'ha pogut escriure les dades: %s"
 
-#: camel/camel-gpg-context.c:1264 camel/camel-gpg-context.c:1672
-#: camel/camel-gpg-context.c:1723
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "No s'ha pogut executar el gpg: %s"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1422
-#: camel/camel-gpg-context.c:1509 camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1616 camel/camel-gpg-context.c:1640
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1745
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "No s'ha pogut executar el gpg."
 
-#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Això és una part d'un missatge, signada digitalment"
 
-#: camel/camel-gpg-context.c:1389 camel/camel-gpg-context.c:1398
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
@@ -9126,27 +9122,27 @@ msgstr ""
 "No s'ha pogut verificar la signatura del missatge. El format del missatge no "
 "és correcte"
 
-#: camel/camel-gpg-context.c:1405
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "No s'ha pogut verificar la signatura del missatge. No s'ha pogut crear el "
 "fitxer temporal: %s"
 
-#: camel/camel-gpg-context.c:1492
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "No s'ha pogut generar les dades per xifrar: %s"
 
-#: camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Això és una part del missatge xifrada digitalment"
 
-#: camel/camel-gpg-context.c:1647 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Contingut xifrat"
 
-#: camel/camel-gpg-context.c:1651
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "No s'ha pogut analitzar el contingut del missatge"
 
@@ -9451,7 +9447,7 @@ msgstr "Les credencials referenciades han caducat."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "La resposta d'autenticació del servidor és incorrecta."
 
@@ -9671,11 +9667,11 @@ msgstr ""
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Paperera"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Escombraries"
@@ -9924,6 +9920,16 @@ msgstr ""
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s. La carpeta no existeix"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "No es pot copiar missatges d'una carpeta NNTP."
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "No es pot copiar missatges d'una carpeta NNTP."
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9941,7 +9947,7 @@ msgstr ""
 "servidor"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronitza automàticamement el correu remot localment"
 
@@ -9963,38 +9969,36 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Per accedir els servidors Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Contrasenya"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Amb aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya "
 "de text sense xifrar."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1584 mail/em-folder-view.c:1622
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Predeterminat"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "S'ha cancel·lat l'operació"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor s'ha desconnectat inesperadament: %s"
@@ -10043,21 +10047,21 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta es va destruir i es va tornar a crear al servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "S'està cercant els missatges canviats"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No es pot obtenir el missatge: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10073,25 +10077,25 @@ msgstr ""
 "No es pot obtenir el missatge: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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 existeix el missatge"
 
-#: camel/providers/imap/camel-imap-folder.c:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Aquest missatge no està disponible actualment"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "S'està recollint la informació del resum per als nous missatges"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta a FETCH."
 
@@ -10148,27 +10152,37 @@ msgstr ""
 "Aplica els filtres als missatges nous de la bústia d'entrada d'aquest "
 "servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Comprova si hi ha correu nou a totes les carpetes"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Comprova si hi ha correu nou a totes les carpetes"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor d'IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei d'IMAP per a %s a %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10177,65 +10191,65 @@ msgstr "Servei d'IMAP per a %s a %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "L'SSL no està disponible"
 
-#: camel/providers/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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 "S'ha cancel·lat la connexió"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "No se suporta l'extensió SSL/TLS."
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "S'ha produït un error en la negociació SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No s'ha pogut connectar amb l'ordre '%s': %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no suporta el tipus d'autenticació sol·licitat (%s)"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No se suporta el tipus d'autenticació %s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "No heu introduït la contrasenya."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10246,13 +10260,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "La carpeta '%s' no existeix"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10260,18 +10274,18 @@ msgstr "La carpeta '%s' no existeix"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "No s'ha pogut crear la carpeta: %s. %s"
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "El nom de carpeta '%s' no és vàlid perquè conté el caràcter '%c'"
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "La carpeta pare és desconeguda: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "La carpeta pare no pot contenir subcarpetes"
 
@@ -10297,7 +10311,7 @@ msgstr ""
 "\n"
 "     No ho feu servir per al correu habitual\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "No s'ha pogut connectar amb el servidor POP a %s"
@@ -10518,9 +10532,9 @@ msgid "Checking for new messages"
 msgstr "S'està comprovant si hi ha nous missatges"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "S'està desant la carpeta"
@@ -10623,77 +10637,77 @@ msgstr "No s'ha pogut canviar el nom a '%s': %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "No s'ha pogut obrir la carpeta: %s. %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "L'analitzador de correu ha generat un error greu a prop de la posició %ld, a "
 "la carpeta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No s'ha pogut comprovar la carpeta: %s. %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "No s'ha pogut obrir el fitxer: %s. %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "El resum i la carpeta no coincideixen, tot i la sincronització"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "No s'ha pogut desar la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "S'ha produït un error en escriure a la bústia temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "S'ha produït un error en escriure a la bústia temporal: %s. %s"
@@ -11096,7 +11110,7 @@ msgstr "Suprimeix després de %s dies"
 msgid "Disable support for all POP3 extensions"
 msgstr "Inhabilita el suport per a totes les extensions POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11187,7 +11201,7 @@ msgid "No such folder `%s'."
 msgstr "No existeix la carpeta '%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11243,7 +11257,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11423,7 +11437,7 @@ msgstr "Lliurament del correu SMTP mitjançant %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "No s'ha pogut enviar el missatge: l'adreça del remitent no és vàlida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "S'està enviant el missatge"
 
@@ -11538,34 +11552,34 @@ msgstr "S'ha acabat el temps d'espera de la petició QUIT: %s"
 msgid "QUIT response error"
 msgstr "S'ha produït un error en la resposta a QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "fitxer adjunt"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista de fitxers adjunts"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Adjunta un fitxer..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -11705,30 +11719,30 @@ msgstr ""
 "S'ha produït un error en llegir el fitxer %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "El fitxer existeix. Voleu sobreescriure'l?"
 
-#: composer/e-msg-composer.c:1170 composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "S'ha produït un error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "S'ha produït un error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "S'ha produït un error en accedir el fitxer: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge de l'editor"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11737,7 +11751,7 @@ msgstr ""
 "No es pot posicionar en el fitxer: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11746,7 +11760,7 @@ msgstr ""
 "No es pot truncar el fitxer: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11755,7 +11769,7 @@ msgstr ""
 "No es pot copiar el descriptor de fitxer: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11764,7 +11778,7 @@ msgstr ""
 "S'ha produït un error en desar automàticament el missatge: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1392
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11772,7 +11786,7 @@ msgstr ""
 "El Ximian Evolution ha trobat missatges sense desar d'una sessió anterior.\n"
 "Voleu provar de recuperar-los?"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11783,45 +11797,45 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Atenció: s'ha modificat el missatge"
 
-#: composer/e-msg-composer.c:1598
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signatura:"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Generat automàticament"
 
-#: composer/e-msg-composer.c:2261
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "S'ha adjuntat <b>%d</b> fitxer"
 msgstr[1] "S'han adjuntat <b>%d</b> fitxers"
 
-#: composer/e-msg-composer.c:2290
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 "_Oculta la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
-#: composer/e-msg-composer.c:2293 composer/e-msg-composer.c:3169
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 "_Mostra la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
-#: composer/e-msg-composer.c:2310 composer/e-msg-composer.c:3051
-#: composer/e-msg-composer.c:3052
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:3081
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11829,7 +11843,7 @@ msgstr ""
 "No s'ha pogut crear la finestra del redactor:\n"
 "no s'ha pogut activar el control de selecció d'adreces."
 
-#: composer/e-msg-composer.c:3110
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11841,7 +11855,7 @@ msgstr ""
 "Assegureu-vos que teniu instal·lades les versions\n"
 "correctes de gtkhtml i libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3214
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11849,7 +11863,7 @@ msgstr ""
 "No s'ha pogut crear la finestra del redactor:\n"
 "no s'ha pogut activar el component editor d'HTML."
 
-#: composer/e-msg-composer.c:4235
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12008,16 +12022,12 @@ msgstr "Categories de sincronització:"
 
 #. 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"
@@ -12069,31 +12079,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. 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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -12229,19 +12231,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Important"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Per fer"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Després"
 
@@ -12345,7 +12347,7 @@ msgstr "fa"
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segons"
 
@@ -12514,7 +12516,7 @@ msgstr "no està marcat"
 msgid "Junk Test"
 msgstr "Prova d'escombraria"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:781
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
@@ -12760,7 +12762,7 @@ msgstr "Correu"
 msgid "Mail Accounts"
 msgstr "Comptes de correu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Preferències del correu"
 
@@ -12798,15 +12800,15 @@ msgstr "Heu d'especificar un nom de fitxer de seqüència vàlid."
 msgid "[script]"
 msgstr "[seqüència]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Idiomes"
 
-#: mail/em-composer-prefs.c:900
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Afegeix una signatura de seqüència"
 
-#: mail/em-composer-prefs.c:920
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatures"
 
@@ -12898,278 +12900,285 @@ msgstr "<cliqueu per seleccionar una carpeta>"
 msgid "Create New Folder"
 msgstr "Crea una carpeta nova"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nom de la carpeta:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "Cap concordança"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Bústia d'entrada"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "S'està carregant..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No s'ha pogut copiar o moure els missatges a la carpeta virtual"
 
-#: mail/em-folder-tree.c:1760
+#: mail/em-folder-tree.c:1798
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr ""
 "No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
 
-#: mail/em-folder-tree.c:1789 mail/em-folder-tree.c:1878
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1805 mail/em-folder-tree.c:1818
-#: mail/em-folder-view.c:658 mail/em-folder-view.c:672
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Crea una carpeta"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "No s'ha pogut suprimir la carpeta : %s"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2094
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "No s'ha pogut suprimir la carpeta: %s. La carpeta no existeix"
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Voleu suprimir la carpeta '%s' i totes les seves subcarpetes?"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Suprimeix '%s'"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s. La carpeta no existeix"
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Canvia el nom de la carpeta '%s' a:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Canvia el nom de la carpeta"
 
-#: mail/em-folder-tree.c:2142
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Ja existeix una carpeta anomenada '%s'. Feu servir un nom diferent."
 
-#: mail/em-folder-tree.c:2188 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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 "_Visualitza"
 
-#: mail/em-folder-tree.c:2189
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Obre'l e_n una finestra nova"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Mou"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nova carpeta..."
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Ca_nvia el nom"
 
-#: mail/em-folder-tree.c:2204 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietats..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:749 mail/em-popup.c:688
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
 
-#: mail/em-folder-view.c:751
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/em-folder-view.c:754 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:808
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:809
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:811
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Reen_via a..."
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "S'ha completat el modi_ficador"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "N_eteja el modificador"
 
-#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "No el marq_uis com a llegit"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "No el _marquis com a important"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Marca'l com a e_scombraria"
 
-#: mail/em-folder-view.c:770 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a escombraria"
 
-#: mail/em-folder-view.c:774
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "Desfés la su_pressió"
 
-#: mail/em-folder-view.c:777
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Mo_u a la carpeta..."
 
-#: mail/em-folder-view.c:778 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Afegeix el remitent a la lli_breta d'adreces"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Apl_ica els filtres"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "C_rea una regla del missatge"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder de l'a_ssumpte"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder del remite_nt"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolde_r dels destinataris"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder de _la llista de correu"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "VFolder del fil"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtra l'a_ssumpte"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtra el remi_tent"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtra els _destinataris"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Fil_tra la llista de correu"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtra el fil"
 
-#: mail/em-folder-view.c:1658
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Predeterminat"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/em-folder-view.c:1909
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliqueu per enviar un correu a en/na %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Concordances: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Sense signar"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13178,11 +13187,11 @@ msgstr ""
 "Aquest missatge no està signat. No hi ha cap garantia que el remitent del "
 "missatge sigui l'autèntic."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "La signatura és vàlida"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13191,11 +13200,11 @@ msgstr ""
 "Aquest missatge està signat i és vàlid. És molt probable que efectivament "
 "sigui el remitent."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "La signatura no és vàlida"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13203,11 +13212,11 @@ msgstr ""
 "No es pot verificar la signatura del missatge. Es pot haver alterat durant "
 "la transmissió."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "La signatura és vàlida però no es pot verificar el remitent"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13215,11 +13224,11 @@ msgstr ""
 "Aquest missatge està signat amb una signatura vàlida, però no es pot "
 "verificar el remitent del missatge."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Sense xifrar"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -13227,11 +13236,11 @@ msgstr ""
 "Aquest missatge no està xifrat. Es podria visualitzar el seu contingut en el "
 "transport per internet."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Xifrat, feble"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -13242,11 +13251,11 @@ msgstr ""
 "visualitzar el contingut d'aquest missatge en una quantitat de temps "
 "raonable."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Xifrat"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13254,11 +13263,11 @@ msgstr ""
 "Aquest missatge està encriptat. Seria molt difícil que una persona "
 "desconeguda visualitzi el contingut d'aquest missatge."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Xifrat, fort"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -13268,32 +13277,32 @@ msgstr ""
 "difícil que alguna persona desconeguda pugui visualitzar el contingut "
 "d'aquest missatge en una quantitat de temps raonable."
 
-#: mail/em-format-html-display.c:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Visualitza el certificat"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "No es pot verificar aquest certificat"
 
-#: mail/em-format-html-display.c:974
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completat el %d de %B del %Y, a les %H:%M"
 
-#: mail/em-format-html-display.c:982
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Retrasat:"
 
 # consulteu man 3 strftime per compendre aquest format
-#: mail/em-format-html-display.c:985
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pel %d de %B del %Y, a les %H:%M"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Visualitza insertat"
 
-#: mail/em-format-html-display.c:1056
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "A_maga"
 
@@ -13367,7 +13376,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:632
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Generador del correu"
 
@@ -13399,15 +13408,20 @@ msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarà com a codi font."
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "No es suporta el format de la signatura"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "S'ha produït un error desconegut en verificar la contrasenya"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
@@ -13427,22 +13441,22 @@ msgstr ""
 "\n"
 "Espereu mentres l'Evolution migra les vostres carpetes..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "No s'ha pogut migrar les memòries cau dels identificadors d'usuari: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "No s'ha pogut migrar l'estat d'expansió de la carpeta: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "No s'ha pogut crear el directori '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "No s'ha pogut obrir el magatzem per a '%s': %s"
@@ -13568,12 +13582,18 @@ msgstr "Desa el missatge..."
 msgid "Add address"
 msgstr "Afegeix una adreça"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Correu de %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13586,7 +13606,7 @@ msgstr ""
 "\n"
 "Voleu suprimir aquests missatges?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13611,332 +13631,322 @@ msgid "Check incoming mail being junk"
 msgstr "Comprova si el correu d'entrada és escombraria"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Comprova si el correu d'entrada dels comptes IMAP és escombraria"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Color per resaltar les cites"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Color per resaltar les cites."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr ""
 "Conjunt de caràcters predeterminat amb què es visualitzaran els missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr ""
 "Conjunt de caràcters predeterminat amb què es redactaran els missatges."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr ""
 "Conjunt de caràcters predeterminat amb què es visualitzaran els missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr ""
 "Conjunt de caràcters predeterminat amb què es visualitzaran els missatges."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Estil de reenviament predeterminat"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
 msgstr "Assumpte predeterminat per al missatge."
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Assumpte predeterminat per al missatge."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Estil de resposta predeterminat"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Amplada predeterminada de la subfinestra de la barra de carpetes"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Amplada predeterminada de la subfinestra de la barra de carpetes"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marca els errors ortogràfics a les paraules mentre escriviu."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Buida les papereres en sortir"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Buida les carpetes de paperera quan sortiu de l'Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Habilita la modalitat de cursor, per veure un cursor quan llegiu el correu."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Habilita/inhabilita el mode de cursor"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Envia aquest missatge"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "conté"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Executa les accions"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configuració del correu"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configuració del correu"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Envia els missatges en format HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Envia els missatges en format HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Mostra"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Mostra"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Envia els missatges en format HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Previsualització:"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Autor original:"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13944,114 +13954,114 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Llista de missatges en cadena"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Llista de missatges en cadena"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Missatge reenviat (sense assumpte)"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Descripció:"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Inhabilitat"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 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:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "No l'eliminis"
@@ -14093,16 +14103,16 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 #, fuzzy
 msgid "Importing..."
 msgstr "S'està movent"
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 #, fuzzy
 msgid "Please wait"
@@ -14123,24 +14133,24 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Creació d'una nova carpeta"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Seleccioneu quin certificat s'importarà..."
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "S'està important"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 #, fuzzy
 msgid "Importing mailbox"
@@ -14283,17 +14293,17 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
 msgstr "Camí:"
@@ -14343,31 +14353,46 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nova VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtres d'edició"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Crea una nova agenda"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "La URI que mostrarà l'agenda"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitat"
 
@@ -14404,7 +14429,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -14427,135 +14452,131 @@ msgid "Connecting to server..."
 msgstr "Connexió de prova a \"%s\""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Detecta els tipus suportats..."
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "conté"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Afegeix un criteri"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunció"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Error desconegut: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Tanca"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Element per fer que venç avui:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Redacta un missatge"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14568,554 +14589,550 @@ msgstr ""
 "Ja teniu enllestida la configuració del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous paràmetres"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Creació d'una nova carpeta"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "conté"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adreça electrònica:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Contactes..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executa les accions"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "acaba amb"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Opcions"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietats de l'adjunció"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Capçalera"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en línia"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Desa i tanca"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cos del missatge"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Esborra la visualització del missatge"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "conté"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organització:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimeix els contactes"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adreça electrònica 2"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Respon"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Data de recepció"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nom de l'estil:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Reenvia"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "juny"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S'està afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Respon a tots"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Descripció:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Suprimeix"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Autor original:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "description"
 msgstr "Descripció:"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "S'està examinant %s"
@@ -15153,175 +15170,175 @@ msgstr "Fi_ltre sobre el remitent"
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'està enviant \"%s\""
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'està marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunció"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està recollint el correu des de %s"
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15358,42 +15375,42 @@ msgstr "Excepcions"
 msgid "Security Information"
 msgstr "Cap informació"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor:"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 #, fuzzy
 msgid "Updating..."
 msgstr "_Paràmetres"
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Paràmetres"
@@ -16527,7 +16544,7 @@ msgstr "Adreça de correu electrònic"
 msgid "Certificate Viewer: %s"
 msgstr "Visualitzador del certificat: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduïu la contrasenya per a '%s'"
@@ -18401,8 +18418,8 @@ msgstr "Amb la _categoria"
 msgid "_Tasks"
 msgstr "_Tasques"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18648,23 +18665,23 @@ msgstr "_Cerca"
 msgid "_Find Now"
 msgstr "_Troba ara"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Neteja"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID de l'element"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID del subelement"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Troba _ara"
 
@@ -18678,6 +18695,12 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
+#~ msgid "No data provided"
+#~ msgstr "No s'ha proporcionat cap dada"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Comprova si el correu d'entrada dels comptes IMAP és escombraria"
+
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
diff --git a/po/cs.po b/po/cs.po
index eff287e24b..3b50e3b29c 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-03-05 14:15+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-03-05 19:20+0100\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"
 
@@ -50,7 +50,6 @@ msgstr "Zde nastavte automatické dokončování"
 #. 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:363
@@ -194,7 +193,6 @@ 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:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
 #: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
@@ -203,7 +201,6 @@ msgid "On This Computer"
 msgstr "V tomto počítači"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
@@ -3106,17 +3103,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í"
 
@@ -3809,10 +3806,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:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -4905,11 +4898,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:591 composer/e-msg-composer.c:2084
@@ -5805,20 +5793,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5842,10 +5822,6 @@ msgstr "%02i rozdělení minuty"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5853,9 +5829,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-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6415,10 +6388,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-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
@@ -6427,10 +6396,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:1606
 msgid "%m/%d/%Y"
@@ -11742,16 +11707,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"
@@ -11803,31 +11764,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
diff --git a/po/da.po b/po/da.po
index 5a1cb2c673..74c1d9ada6 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -56,8 +56,7 @@ msgstr "Konfigurér dine e-post-konti her"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -98,20 +97,20 @@ msgstr "Evolution mappeindstillingsopsætnings-styreelement"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Adressebog"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -119,67 +118,67 @@ msgstr "Adressebog"
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Ny kontakt:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Opret en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Opret en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Tilslutning til LDAP-serveren mislykkedes"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Mislykkedes med godkendelse på LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Serveren svarede at ingen søgebaser understøttes"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Fejl ved hentning af schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Serveren svarede ikke med gyldig schemainformation"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Venter..."
@@ -193,42 +192,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinger %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personligt"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Mapper for automatisk udfyldning"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -240,7 +241,7 @@ msgstr ""
 "Gør din søgning mere specifik eller øg resultatgrænsen i\n"
 "katalogserverindstillingerne for denne adressebog."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -253,19 +254,19 @@ msgstr ""
 "specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
 "for denne adressbog."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bagenden for denne adressebog kunne ikke forstå forespørgslen."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel udførtes ikke successfuldt."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -274,7 +275,7 @@ msgstr ""
 "Kunne ikke åbne denne adressebog. Kontrollér venligst at stien\n"
 "eksisterer, og at du har rettigheder til at tilgå den."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -284,7 +285,7 @@ msgstr ""
 "at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
 "kan nåes."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -296,7 +297,7 @@ msgstr ""
 "må du oversætte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra adressen nedenfor.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -306,28 +307,33 @@ msgstr ""
 "at du har angivet en fejlagtig URI eller at LDAP-serveren ikke\n"
 "kunne nåes."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åbne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Tilslutter LDAP-serveren anonymt"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Mislykkedes med godkendelse.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAngiv adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URIen som kalenderen skal vise"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URIen som kalenderen skal vise"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -371,7 +377,7 @@ msgstr "  _Vis de baser som understøttes "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -404,20 +410,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "LDAP-konfigurationsassistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Adressebogs-kilder"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adressebogs-kilder"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adressbogskilder..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Altid"
 
@@ -428,7 +435,8 @@ msgstr "Anonymt"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -437,52 +445,52 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme de indstillinger du har angivet her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Færdig"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Gruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -496,23 +504,23 @@ msgstr ""
 "serverer for kryptografisk at beskytte din tilslutning. Spørg din "
 "systemadministratør om din LDAP-server anvender disse protokoller."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Én"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Søger..."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Valgt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -521,7 +529,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -538,7 +546,7 @@ msgstr ""
 "på arbejdet behøver Evolution ikke at anvende SSL/TLS eftersom forbindelsen "
 "allerede er sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -551,7 +559,7 @@ 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:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -561,44 +569,45 @@ msgstr ""
 "At vælge dette alternativ vil lade dig ændre Evolutions indstillinger\n"
 "for LDAP-søgninger, og for at oprette og redigere kontakter."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "At vælge et visningsnavn er det sidste nødvendige skridt ved konfiguration "
 "af en LDAP-server."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Skridt 1: Serverinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Skridt 2: Tilslutter server"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Skridt 3: Søger i kataloget"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -612,7 +621,7 @@ msgstr ""
 "skal ændre\n"
 "disse."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -624,7 +633,7 @@ msgstr ""
 "Hvis du efterlader dette tomt kommer søgningen at begynde ved roden af "
 "katalogtræet."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -639,12 +648,13 @@ msgstr ""
 "Søgeomfanget \"one\" inkluderer alene de poster som er et niveau under din "
 "søgebase.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -656,7 +666,7 @@ msgstr ""
 "finde\n"
 "denne information."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -664,17 +674,18 @@ msgstr ""
 "Dette er det komplette navn på din ldap-server. For eksempel \"ldap.mitfirma."
 "dk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Dette er det største antal poster der skal hentes. Sættes dette tal for "
 "højt\n"
 "sænkes hastigheden på adressebogen."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -684,7 +695,7 @@ msgstr ""
 "at sætte dette til \"E-postadresse\" kræver anonym adgang til din ldap-"
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -693,7 +704,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -703,7 +714,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:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -714,28 +725,28 @@ msgstr ""
 "En liste med standard er givet. Spørg din systemadministrator hvilken port "
 "du skal bruge."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "An_vend SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Bruger distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Bruger e-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Når det er muligt"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -748,19 +759,19 @@ msgstr ""
 "brugerinformation. Spørg din systemadministratør hvis du er usikker på denne "
 "information."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -769,39 +780,39 @@ msgstr "_Nedhæntningsgrænse:"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Logindmetode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "forbindelsesfaneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "generel-faneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
@@ -927,7 +938,7 @@ msgstr "Samarbejde"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1028,10 +1039,10 @@ msgstr "Ka_tegorier..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1083,15 +1094,15 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2086,109 +2097,117 @@ msgid "AOL Instant Messenger"
 msgstr "_Post meddelelse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Navnløs liste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Send _besked"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Tjeneste klar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Sted:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Bruger_navn:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Hjemme"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Arbejde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Kilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Ændret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategori-redigering ikke tilgængelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt hører til disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Gem kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2196,7 +2215,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "fjerne disse kontakter?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2204,49 +2223,54 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette denne kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Gruppe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hurtig kontakt-tilføjelse"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Redigér alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Fulde navn:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr "E-post"
@@ -2410,11 +2434,11 @@ msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2505,13 +2529,13 @@ msgid "Email begins with"
 msgstr "E-postadresse begynder med"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
@@ -2528,101 +2552,101 @@ msgid "Type"
 msgstr "Type"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Adressebog"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importér..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Søg efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbogskilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilotindstillinger..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressebog..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressebog..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktuel visning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2634,8 +2658,8 @@ 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:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -2678,7 +2702,7 @@ msgid "Company Phone"
 msgstr "Firmatelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2740,7 +2764,7 @@ msgid "Nickname"
 msgstr "Kaldenavn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2749,7 +2773,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2877,69 +2901,75 @@ msgstr "Valgt"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Arbejde"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Jobtitel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax hjemme"
@@ -2949,8 +2979,8 @@ msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2982,7 +3012,7 @@ msgstr "Protokollen er ikke understøttet"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3002,7 +3032,8 @@ msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adressbogen findes ikke"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3144,7 +3175,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Kører forespørgsel i adressebog..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3202,18 +3234,38 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution LDIF-importerer"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP-dataudvækslingsformat (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution VCard-importerer"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolutions VCard-importerer"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Udskriv valgte kontakter"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Udskriv valgte kontakter"
@@ -3306,7 +3358,7 @@ msgstr "Margener"
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Valgmuligheder"
 
@@ -3489,8 +3541,8 @@ msgstr "Intet filnavn angivet."
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Indtast adgangskode"
@@ -3571,10 +3623,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolutions testkomponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Opgaver"
 
@@ -3619,26 +3670,24 @@ msgstr "Udsæt-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edigér aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Åbn"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Åbn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3647,12 +3696,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3664,7 +3713,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3681,19 +3730,19 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køre dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
@@ -3838,24 +3887,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammendrag indeholder"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivelse indeholder"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3888,7 +3943,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
@@ -3910,77 +3965,77 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Møde"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Mød_e"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opret en ny mødeindkaldelse"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nyt heldagsmøde"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmøde"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alender:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Opret en ny mappe"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4115,7 +4170,7 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4188,7 +4243,7 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4199,7 +4254,7 @@ msgstr "start på aftale"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktiveret"
 
@@ -4251,7 +4306,7 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Advarsler"
 
@@ -4276,7 +4331,7 @@ msgid "Days"
 msgstr "Dage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_ktivér"
 
@@ -4419,7 +4474,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4521,7 +4576,7 @@ msgstr ""
 "Klik på knappen \"Afslut\" for at gemme de indstillinger du har angivet her."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Opgaveliste"
@@ -4700,23 +4755,23 @@ msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfejl: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Fuldført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Fuldført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Færdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Færdig "
 
@@ -4752,8 +4807,8 @@ msgstr "Journalopføring - %s"
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Gem som..."
 
@@ -4785,11 +4840,21 @@ msgstr "Aflys operation"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Vælg en målmappe til at importere data"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Opgaveliste"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4897,7 +4962,7 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Aftale"
 
@@ -4921,23 +4986,31 @@ msgstr "Mødeplanlægning"
 msgid "Meeting"
 msgstr "Møde"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Slutdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Starttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Sluttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
@@ -5018,29 +5091,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Den valgte organisator har ikke længere en konto."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -5236,7 +5309,7 @@ msgstr "den"
 msgid "occurrences"
 msgstr "gentagelser"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dato/klokke:"
@@ -5273,7 +5346,7 @@ msgid "_No recurrence"
 msgstr "I_ngen genindtræffelse"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -5316,7 +5389,7 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Forkast ændringer"
 
@@ -5341,7 +5414,7 @@ msgstr "Opgaveinformationen er genereret. Send den?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
 
@@ -5354,7 +5427,7 @@ msgstr "% færdig"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Fuldført"
 
@@ -5367,7 +5440,7 @@ msgstr "Høj"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "I gang"
 
@@ -5386,7 +5459,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -5428,16 +5501,16 @@ msgstr "Grundlæggende"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kunne ikke åbne adressebogen"
@@ -5448,7 +5521,7 @@ msgstr "Kon_fidensiel"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5642,11 +5715,10 @@ msgstr "Startdato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "farve"
 
@@ -5672,7 +5744,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Ø"
 
@@ -5707,10 +5779,10 @@ msgstr "Nej"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukendt"
@@ -5723,99 +5795,105 @@ msgstr "Genindtræffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Åbn"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
@@ -5903,7 +5981,7 @@ msgid "Alarms"
 msgstr "Alarmer"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Fuldført"
 
@@ -5961,26 +6039,26 @@ msgstr "%02i minutters opdeling"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr " "
@@ -6163,7 +6241,7 @@ msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
@@ -6623,12 +6701,12 @@ msgstr "_Prioritet:"
 msgid "Web Page:"
 msgstr "Side"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klik for at tilføje en opgave"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6638,7 +6716,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6646,12 +6724,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6660,29 +6738,39 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Indlæser billeder"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Ingen aftaler."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Åbn i %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6802,16 +6890,16 @@ msgstr "Ledig/optaget-information (%s til %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i arrangementet"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6819,7 +6907,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6827,12 +6915,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7021,49 +7109,49 @@ msgstr "Valgt måned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Opgave"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Færdige procenter: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Udskriv element"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
@@ -7072,39 +7160,39 @@ msgstr "Printeropsætning"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7161,20 +7249,20 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Offentlig mappe som indeholder mødelser og hændelser"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Påmindelse!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalenderhændelser"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7182,7 +7270,7 @@ msgstr ""
 "Evolution har fundet Gnome-kalenderfiler.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenderen"
 
@@ -8844,7 +8932,7 @@ msgstr "Kan ikke åbne besked"
 msgid "Failed on message %d"
 msgstr "Mislykkedes på besked %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
@@ -8930,7 +9018,7 @@ msgstr "Kopierer meddelelser"
 msgid "Filtering new message(s)"
 msgstr "Henter %d beskeder"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8941,15 +9029,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Mislykkedes med at tolke gpg-tips for brugerid."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Mislykkedes med at tolke gpg-løsen."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8958,30 +9046,26 @@ msgstr ""
 "Du skal bruge et gpg-løsen for at låse nøglen op\n"
 "for brugeren: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Ingen data givet"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Mislykkedes med at kryptere: ingen gyldige modtagere angivet."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8992,34 +9076,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Mislykkedes med at GPG'e %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg kunne ikke udføres: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "gpg kunne ikke udføres."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9027,28 +9111,28 @@ 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indeksér meddelelsers indhold"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikke hente besked fra redigering"
@@ -9159,22 +9243,35 @@ msgstr "Kunne ikke dekryptere MIME-del: ugyldig struktur"
 msgid "parse error"
 msgstr "tolkningsfejl"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "E-post-udbyder for virtuelle mapper"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "For læsning af e-post som en forespørgsel på et andet sæt mapper"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Kunne ikke indlæse %s: Modulindlæsning er ikke understøttet på dette system."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke indlæse %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke indlæse %s: Ingen initieringskode i modulet."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Ingen udbyder tilgængelig for protokol `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonym"
@@ -9326,7 +9423,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -9461,20 +9558,7 @@ msgstr "Opslag af værtsnavn mislykkedes: vært kunne ikke findes"
 msgid "Host lookup failed: unknown reason"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "E-post-udbyder for virtuelle mapper"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "For læsning af e-post som en forespørgsel på et andet sæt mapper"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Ingen udbyder tilgængelig for protokol `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9544,21 +9628,25 @@ msgstr "Server: %s, Type: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Affald"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9791,21 +9879,31 @@ msgstr "Ingen sådan besked %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Kunne ikke lukke midlertidig mappe: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9822,16 +9920,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Hent nye beskeder _automatisk hver(t)"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adressebog"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9851,44 +9944,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Adgangskode"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Standard"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Tyk tåge"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9897,26 +9988,26 @@ msgstr ""
 "Advarsel fra IMAP-serveren %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Svar fra server blev afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
@@ -9931,7 +10022,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev ødelagt og genskabt på serveren."
 
@@ -9940,12 +10031,12 @@ msgstr "Mappen blev ødelagt og genskabt på serveren."
 msgid "Scanning for changed messages"
 msgstr "Søger efter ændrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente meddelelse: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9961,25 +10052,25 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilgængelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -10037,27 +10128,37 @@ msgstr "Navneområde"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Se efter nye beskeder i alle mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Se efter nye beskeder i alle mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10066,65 +10167,65 @@ msgstr "IMAP-tjeneste for %s på %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10135,24 +10236,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
@@ -10174,7 +10283,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kunne ikke tilslutte POP-servern %s"
@@ -10257,8 +10366,8 @@ msgstr ""
 "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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10270,55 +10379,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke gemme sammendrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilføje besked i sammendraget: ukendt grund"
 
@@ -10336,53 +10445,44 @@ msgstr "Kan ikke tilføje besked i maildir mappe: %s: %s"
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke åbne mappe `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke oprette mappe `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10404,9 +10504,9 @@ msgid "Checking for new messages"
 msgstr "Checker for nye meddelelser"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Gemmer mappe"
@@ -10450,159 +10550,137 @@ msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke åbne fil `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Kan ikke oprette en mappe med det navn"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke oprette katalog %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Kan ikke vedlægge fil %s: ikke en almindelig fil"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Kunne ikke oprette fil '%s'\n"
+"Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en normal fil."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke slette mappen `%s'\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Kan ikke oprette en mappe med det navn"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke åbne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal fejl i læsning af postboksen nær position %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke tjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke åbne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åbne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke ændre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke gemme mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
@@ -10616,10 +10694,17 @@ msgstr "Tilføjet brev er annulleret"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' er ikke et katalog."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Finder ikke mappe: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10641,6 +10726,29 @@ msgstr "Køen \"%s\" er ingen almindelig fil eller katalog"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Kan ikke åbne mappe `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mappen `%s' eksisterer ikke."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10881,47 +10989,47 @@ msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Der findes ingen sådan mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kunne ikke hente gruppe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Kunne ikke sende beskeden: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-kommandoen mislykkedes: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Skanner nye meddelelser"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukendt serversvar: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Anvend afbryd"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlingen mislykkedes: %s"
@@ -10968,7 +11076,7 @@ msgstr "Slet efter %s dage"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11058,7 +11166,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen sådan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11112,7 +11220,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11278,7 +11386,7 @@ msgstr "SMTP e-postlevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Sender besked"
 
@@ -11384,34 +11492,34 @@ msgstr "QUIT-forespørgslen gav time-out: %s"
 msgid "QUIT response error"
 msgstr "Fejl i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opføringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Tilføj bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Vedlæg en fil til beskeden"
 
@@ -11532,19 +11640,19 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11553,30 +11661,30 @@ msgstr ""
 "Fejl under læsning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indlæsning af fil: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11585,7 +11693,7 @@ msgstr ""
 "Kunne ikke søge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11594,7 +11702,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11603,7 +11711,7 @@ msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11612,7 +11720,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11621,7 +11729,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du prøve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11632,43 +11740,43 @@ msgstr ""
 "\n"
 "Vil du gemme dine ændringar?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automatisk genereret"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11676,7 +11784,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adresseudvælgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11688,7 +11796,7 @@ msgstr ""
 "Verficér at du har de rette versioner af\n"
 "gtkhtml og libgtkhtml installeret.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11696,7 +11804,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12044,7 +12152,7 @@ msgstr "Så"
 msgid "You must specify a folder."
 msgstr "Du skal angive en mappe."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Vælg mappe"
@@ -12059,19 +12167,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Vigtig"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "At-gøre"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Senere"
 
@@ -12160,7 +12268,7 @@ msgstr ""
 "Meddelelsedatoen vil blive sammenlignet med\n"
 "den aktuelle tiden når filtreringen kørs."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -12176,7 +12284,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr " sekunder"
 
@@ -12346,7 +12454,7 @@ msgstr "er ikke markeret med flag"
 msgid "Junk Test"
 msgstr "Juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12454,9 +12562,10 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Emne"
 
@@ -12464,25 +12573,25 @@ msgstr "Emne"
 msgid "Unset Status"
 msgstr "Neutraliser status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnavnet \"%s\" er ikke unikt, vælg et andet."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Tilføj regel"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Regelnavn"
 
@@ -12522,15 +12631,15 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Du skal give navn til denne vfolder."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du skal specificere mindst en mappe som kilde."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Kilde for virtuel mappe"
 
@@ -12581,9 +12690,9 @@ msgstr "Evolution e-post-mappevisning"
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Post"
 
@@ -12591,7 +12700,7 @@ msgstr "Post"
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "E-post-indstillinger"
 
@@ -12629,15 +12738,15 @@ msgstr "Du skal angive et gyldigt skriptnavn."
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Sprog"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Tilføj skriptsignatur"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -12724,7 +12833,6 @@ msgid "Unread messages"
 msgstr "Næste _ulæste meddelelse"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vælge en mappe>"
 
@@ -12732,394 +12840,411 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Create New Folder"
 msgstr "Opret ny mappe"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Indlæser..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Opret en ny mappe"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Skal mappen \"%s\" virkelig fjernes?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slet \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Åbn i nyt vindue"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Flyt"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Omdøb"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Føl_g op..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Marker færdi_ge med flag"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Neutralis_er flag"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_kér som læst"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Markér som uvi_gtig"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Anvend filtre"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe på e-post-_liste"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på em_ne"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrér på afsen_der"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrér på modta_gere"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på afsen_der"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Standard"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiér henvisning"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik for at tilføje en opgave"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Træffere:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Tildelt"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Redigér signatur"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Redigér signatur"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Afbrudt"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Kryptér med PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Overskredet:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis indlejret"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Skjul"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
@@ -13163,29 +13288,34 @@ msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 msgid "Formatting message"
 msgstr "Flytter beskeder"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -13199,8 +13329,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13218,21 +13348,26 @@ msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Et ikke understøttet skema"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Kan ikke verificere bladsignatur"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Kan ikke verificere bladsignatur"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13244,60 +13379,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Kunne ikke cache %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Kunne ikke cache %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Besked uden titel"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Åbn henvisning i netlæser"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Send _besked til liste..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Tilføj afsenderen i adressebogen"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
@@ -13347,18 +13482,18 @@ msgstr "Filtre"
 msgid "-------- Forwarded Message --------"
 msgstr "Videresendt besked"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13367,7 +13502,7 @@ msgstr ""
 "Kan ikke gemme til \"%s\":\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13376,32 +13511,38 @@ msgstr ""
 "\"%s\" findes allerede.\n"
 "Vil du overskrive den?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Besked"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gem besked som..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Adresse"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "E-post fra %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13415,7 +13556,7 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse meddelelser?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13444,319 +13585,327 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Standard-emne for beskeden"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Standard-emne for beskeden"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Søg efter tekst i kroppen af vist besked"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "_Videresendelsesformat:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Standard-emne for beskeden"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Standard-emne for beskeden"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "_Svarsstil:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Slå visning af mappelinjen fra/til"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Slå visning af mappelinjen fra/til"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "E-post-konti"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Udfør handlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Notifikation om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Notifikation om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Send HTML-baseret e-post?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Send HTML-baseret e-post?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Vis animerede billeder"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Vis animerede billeder"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Vis besked i normal stíl"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Forhåndsvisningsvindue"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Spil lydfil når ny post ankommer"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Stave_kontrol"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminalskrifttype:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13764,172 +13913,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Beskedsliste med tråde"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Beskedsliste med tråde"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Gør dette til min standardkonto"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "V_ariabel bredde:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importér"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution elm-importering"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-importering"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Venligst vent"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importerer %s som %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Søger i %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importerer filer"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13937,16 +14083,44 @@ msgstr ""
 "Evolution har fundet Elm e-post-filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Slet denne mappe"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Vælg importør"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importerer"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importerer filer"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Søger i %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13972,7 +14146,7 @@ msgstr ""
 "Kontroller de importerede filtre for at sikre dig at\n"
 "alting stadigvæk fungerer som tiltænkt."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13984,7 +14158,7 @@ msgstr ""
 "tråd\", som ikke understøttes i Evolution.\n"
 "Disse filtre vil blive forkastet."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13998,31 +14172,24 @@ msgstr ""
 "ændredes til at teste hvorvidt strengen findes\n"
 "eller ikke findes i meddelelseteksten."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Gennemsøger e-post-filtre"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Søger i katalog"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Starter import"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "E-post-filtre"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14030,11 +14197,20 @@ msgstr ""
 "Evolution har fundet Netscape e-post-filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importerer filer"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adressebog"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14042,7 +14218,7 @@ msgstr ""
 "Evolution har fundet Pine e-post-filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14085,19 +14261,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikke udfyldt al nødvendig information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Vært:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "S_ti:"
 
@@ -14149,28 +14325,43 @@ msgstr ""
 "    \"%s\"\n"
 "og er blevet opdateret."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Ny Virtuel mappe"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-post-filtre"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Opret en ny mappe"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14213,7 +14404,7 @@ msgstr ""
 "Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør "
 "du spørge din systemadministrator eller Internetleverandør."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Håndtering af konti"
 
@@ -14239,121 +14430,116 @@ msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Søg efter understøttede typer"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL understøttes ikke i denne udgave af Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke understøttet i denne version af evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Kryptér altid til mig selv ved sending af krypteret e-post."
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Kontoredigeringsværktøj"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Tilføj sk_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Tilføj ny signatur..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kryptér a_ltid til mig selv når krypteret post sendes"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Send altid en _blindkopi (Bcc) til:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Send altid en _kopi (Cc) til:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Stol altid på nøgler i min nøglering ved kryptering"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Vedhæft originalmeddelelse"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticering"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Te_gnkodning:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "F_arver"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Kontrollér stavning mens jeg skri_ver"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Farve på _fejlstavede ord:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Redigerer meddelelser"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14369,283 +14555,279 @@ msgstr ""
 "\n"
 "Klik på \"Fuldfør\" for at gemme dine indstillinger."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Standardopførsel"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Standardtegn_kodning: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Fjerner post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Citér ikke originalmeddelelse"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signér ikke _mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Færdig"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Udkast_mappe:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-post-konti"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-post-_adresse:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Kør kommando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Færre alternativer"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Skrifttypeegenskaber"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatér meddelelser i _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Toptekst"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Markér _citat med"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Indlejret"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiketter og farver"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Indlæser billeder"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Meddelelseredigeringsværktøj"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Meddelelsesvisning"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Beskedsskrifttype"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notifikation om ny post"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gange"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Yderligere information"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nøgleid:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vælg en farve"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Udskrevne skrifttyper"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citér originalmeddelelse"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "H_usk denne adgangskode"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Sva_r-til:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Modtager e-post"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Modtagelsesmuligheder"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Husk denne _adgangskode"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Nødvendig information"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Genetablér standardalternativ"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_ikkerhed"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Vælg HTML-skrifttype med fast bredde"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Vælg HTML-skrifttype med variabel bredde"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mappe til sendte _beskeder:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og udkast"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server kræver _godkendelse"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Angiv _filnavn:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Stave_kontrol"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14655,7 +14837,7 @@ msgstr ""
 "din signatur. Navnet du angiver vil bare\n"
 "anvendas for visning."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14664,7 +14846,7 @@ msgstr ""
 "Denne side lader dig konfigurere opførsel af stavekontrol og sprog. Listen "
 "med sprog her viser kun de sprog for hvilke en ordbog er installeret."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14672,15 +14854,15 @@ msgstr ""
 "Indtast navnet via hvilket du vil referere til denne konto.\n"
 "For eksempel: \"Job\" eller \"Personlig\"."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14690,174 +14872,174 @@ msgstr ""
 "\n"
 "Klik \"Næste\" for at begynde. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Tilføj signatur"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Altid indlæs billeder fra nettet"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Godkendelsesstype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Hent nye beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Indsæt _automatisk smiley-billeder"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Bib når ny post ankommer"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekræft når en folder udrenses"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Standardsignatur:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Standardværdier"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notificér mig ikke når ny post ankommer"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Videresendelsesformat:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Fulde navn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Juni"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Indlæs billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Gør dette til min standardkonto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Markér meddelelser som læste efter"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Indlæs aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spil lydfil når ny post ankommer"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spørg når meddelelser sendes med en _tom emnelinie"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Modtager post"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Genskab standardalternativer"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Slet..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Afsendelse af post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Vis animerede billeder"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standard-skrifttype:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Brug sikker anslutning (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -14880,7 +15062,7 @@ msgstr ""
 "Fejl under udførsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Arbejder"
 
@@ -14892,128 +15074,128 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet på besked %d af %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15022,7 +15204,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15031,11 +15213,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15044,22 +15226,22 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15094,38 +15276,38 @@ msgstr "Undtagelser"
 msgid "Security Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Afbryd _alle"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Venter..."
 
@@ -15234,20 +15416,20 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
@@ -15577,97 +15759,20 @@ msgstr "Frakobletmapper"
 msgid "Autocompletion Folders"
 msgstr "Mapper for automatisk udfyldning"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Kan ikke kopiere mappe: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Kan ikke flytte mappe: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Kan ikke flytte en mappe over i sig selv."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Kan ikke kopiere en mappe over i sig selv."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Specificér en mappe som mappen \"%s\" skal kopieres til:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopiér mappe"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Specificér en mappe at flytte mappen \"%s\" til:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Flyt mappe"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Kunne ikke slette mappe:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Skal mappen \"%s\" virkelig fjernes?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Kunne ikke ændre navn på mappe:\n"
+"Kan ikke oprette specificeret katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Den valgte mappe tilhører ikke en anden bruger"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Kan ikke fjerne mappen:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan ikke oprette specificeret katalog:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uden navn)"
@@ -15808,7 +15913,7 @@ msgstr "gpg kunne ikke udføres."
 msgid "_Import"
 msgstr "Importér"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
@@ -15846,6 +15951,10 @@ msgstr "Kunne ikke åbne den delte mappe: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke oprette den angivne delte mappe."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Starter import"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15954,123 +16063,6 @@ msgstr "Konfigurationsdatabase ikke fundet"
 msgid "Generic error"
 msgstr "Generisk fejl"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Opret ny genvejsgruppe"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Gruppenavn:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Vil du virkelig fjerne gruppen '%s' fra genvejslinjen?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Omdøb genvejsgruppen"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Ændr valgt genvejsgruppe til:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Vis genveje som små ikoner"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Store i_koner"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Vis genveje som store ikoner"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Ny gruppe..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Opret en ny genvejsgruppe"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Fje_rn denne gruppe..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Fjern denne genvejsgruppe"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Omdøb denne gruppe..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Omdøb denne genvejsgruppe"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Sk_jul genvejslinjen"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Skjul genvejslinjen"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Opret _standardgenveje"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Opret standardgenveje"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Omdøb genvej"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Omdøb valgt genvej til:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Åbn mappen som denne genvej henviser til"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Åbn i nyt _vindue"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Åbn mappen som denne genvej henviser til i et nyt vindue"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Omdøb denne genvej"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Fjern"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Fjern denne genvej fra genvejslinjen"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Fejl ved gemning af genveje."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Genveje"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Afkrydsningsboks"
@@ -16081,11 +16073,6 @@ msgstr "Afkrydsningsboks"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" i \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16390,59 +16377,59 @@ msgstr ""
 "%s: --online og --offline kan ikke bruges sammen.\n"
 "  Brug %s --help for mere information.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vælg importør"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Fremgang"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Udtryk"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-post-adresse:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Indtast adgangskode for %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16511,7 +16498,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Certifikat-ID:"
@@ -16586,11 +16573,11 @@ msgstr "Organisationsenhed"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16639,240 +16626,240 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m-%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "O.k."
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Certifikat utroværdigt"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen information"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "bilag"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Udtryk"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s ved %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Certifikatsignaturfejl"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Indsæt"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfejl"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Indtast adgangskode for %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Certifikat-ID:"
@@ -17471,7 +17458,8 @@ msgid "_Threaded Message List"
 msgstr "Beskedsliste med _tråde"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "_Tilføj afsenderen i adressebogen"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17479,7 +17467,8 @@ msgid "A_pply Filters"
 msgstr "_Anvend filtre"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Tilføj afsenderen i adressebogen"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17932,10 +17921,6 @@ msgstr "For_matér"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Åbn"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Åbn en fil"
@@ -18307,22 +18292,6 @@ msgstr "_Send / modtag"
 msgid "_Window"
 msgstr "_Søg nu"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Udskriv sammendrag"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Udskriv sammendrag"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Genindlæs"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Genindlæs visningen"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Efter _firma"
@@ -18389,8 +18358,8 @@ msgstr "Med _kategori"
 msgid "_Tasks"
 msgstr "_Opgaver"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18639,23 +18608,23 @@ msgstr "_Søg"
 msgid "_Find Now"
 msgstr "_Søg nu"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Underobjekt-ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Find nu "
@@ -18670,6 +18639,206 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressebogs-kilder"
+
+#~ msgid "No data provided"
+#~ msgstr "Ingen data givet"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke åbne fil `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke oprette katalog %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke oprette fil '%s'\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' er ikke et katalog."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importerer %s som %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Gennemsøger e-post-filtre"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Søger i katalog"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Kan ikke kopiere mappe: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Kan ikke flytte mappe: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Kan ikke flytte en mappe over i sig selv."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Kan ikke kopiere en mappe over i sig selv."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Specificér en mappe som mappen \"%s\" skal kopieres til:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopiér mappe"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Specificér en mappe at flytte mappen \"%s\" til:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Flyt mappe"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke slette mappe:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Skal mappen \"%s\" virkelig fjernes?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke ændre navn på mappe:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Den valgte mappe tilhører ikke en anden bruger"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke fjerne mappen:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Opret ny genvejsgruppe"
+
+#~ msgid "Group name:"
+#~ msgstr "Gruppenavn:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Vil du virkelig fjerne gruppen '%s' fra genvejslinjen?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Omdøb genvejsgruppen"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Ændr valgt genvejsgruppe til:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Små ikoner"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Vis genveje som små ikoner"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Store i_koner"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Vis genveje som store ikoner"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Ny gruppe..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Opret en ny genvejsgruppe"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Fje_rn denne gruppe..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Fjern denne genvejsgruppe"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Omdøb denne gruppe..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Omdøb denne genvejsgruppe"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Sk_jul genvejslinjen"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Skjul genvejslinjen"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Opret _standardgenveje"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Opret standardgenveje"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Omdøb genvej"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Omdøb valgt genvej til:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Åbn mappen som denne genvej henviser til"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Åbn i nyt _vindue"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Åbn mappen som denne genvej henviser til i et nyt vindue"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Omdøb denne genvej"
+
+#~ msgid "Re_move"
+#~ msgstr "_Fjern"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Fjern denne genvej fra genvejslinjen"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Fejl ved gemning af genveje."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Genveje"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" i \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Udskriv sammendrag"
+
+#~ msgid "Print summary"
+#~ msgstr "Udskriv sammendrag"
+
+#~ msgid "Reload"
+#~ msgstr "Genindlæs"
+
+#~ msgid "Reload the view"
+#~ msgstr "Genindlæs visningen"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopiér til mappe..."
 
@@ -19304,25 +19473,10 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Vis visningsadresser"
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolution LDIF-importerer"
-
 #, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Evolution LDIF-importerer"
 
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "LDAP-dataudvækslingsformat (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolution VCard-importerer"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolutions VCard-importerer"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Searching..."
 #~ msgstr "Søger..."
 
@@ -27294,9 +27448,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Appointments"
 #~ msgstr "Aftaler"
 
-#~ msgid "No appointments."
-#~ msgstr "Ingen aftaler."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27801,9 +27952,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Moderate mist"
 #~ msgstr "Moderat tåge"
 
-#~ msgid "Thick mist"
-#~ msgstr "Tyk tåge"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Tynd tåge"
 
@@ -28332,9 +28480,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Opret et nyt vindue som viser denne mappe"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Slet denne mappe"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Vis en anden mappe"
 
diff --git a/po/de.po b/po/de.po
index 231ac9d6c1..da2b75e829 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -56,8 +56,7 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -97,21 +96,22 @@ msgstr "Bedienelement zur Konfiguration von Evolution-Ordnern"
 msgid "Manager your S/Mime certificates here"
 msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, 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-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -119,65 +119,65 @@ msgstr "Neues Adressbuch"
 msgid "Delete"
 msgstr "Löschen"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Ko_ntaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Verbindungsaufbau mit LDAP-Server gescheitert"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Legitimation am LDAP-Server gescheitert"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Der Server antwortete mit nicht unterstützten Suchbasen"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Dieser Server unterstützt keine LDAPv3-Schemainformationen"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Fehler beim Abrufen der Schemainformationen"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Server antwortetet nicht mit einer gültigen Schemainformationen"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migrationsvorgang..."
 
@@ -194,39 +194,41 @@ msgstr ""
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "»%s« wird migriert:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Auf diesem Computer"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Persönlich"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP-Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Einstellungen der Auto-Vervollständigung"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -238,7 +240,7 @@ msgstr ""
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -250,23 +252,23 @@ msgstr ""
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -274,7 +276,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad existiert und Sie darauf zugreifen dürfen."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -283,7 +285,7 @@ msgstr ""
 "Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
 "erreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -294,7 +296,7 @@ msgstr ""
 "CVS-Quelltext kompilieren, nachdem Sie sich von untenstehendem Link OpenLDAP "
 "besorgt haben."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -303,27 +305,32 @@ msgstr ""
 "Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
 "ist."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch konnte nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonymer Zugriff auf LDAP-Server"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID der Kontaktquelle, die diese Ansicht anzeigt"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "Der URI, den der Kalender anzeigen wird"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList-XML für die Liste der Vervollständigungs-URIs"
@@ -369,7 +376,7 @@ msgstr "  Unterstützte Basen _anzeigen"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -401,19 +408,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Assistent zum Anlegen eines Adressbuchs"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adressbuchquellen"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adressbuchquellen..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Immer"
 
@@ -424,7 +434,8 @@ msgstr "Anonym"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -434,53 +445,53 @@ msgstr ""
 "Bitte klicken sie den »Fertigstellen«-Knopf an, um die von Ihnen\n"
 "vorgenommenen Einstellungen zu speichern."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Eindeutiger _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Beendet"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nie"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -497,23 +508,23 @@ msgstr ""
 "Ihren\n"
 "Systemadministrator ob Ihr LDAP-Server diese Protokolle unterstützt."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Eins"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Suchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Gewählt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -523,7 +534,7 @@ msgstr ""
 "mit Ihrem\n"
 "LDAP-Server her, falls dieser SSL oder TLS unterstützt."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -540,7 +551,7 @@ msgstr ""
 "Ihre Verbindung bereits\n"
 "sicher ist."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -554,7 +565,7 @@ msgstr ""
 "Sie anfällig\n"
 "für Sicherheitslücken sind. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -565,40 +576,42 @@ msgstr ""
 "Suche auf LDAP-Servern sowie das Anlegen und Bearbeiten von Kontakten "
 "festlegen."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Sie müssen zunächst den angezeigten Namen und eine Gruppe für das Adressbuch "
 "eingeben."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Schritt 1: Ordnermerkmale"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Schritt 2: Server-Informationen"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Schritt 3: Verbindungsaufbau mit Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Schritt 4: Das Verzeichnis durchsuchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Unterstützte Suchbasen"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -611,7 +624,7 @@ msgstr ""
 "aufgenommen werden sollen und wie lange eine Suche dauern darf. Fragen\n"
 "Sie Ihren Systemadministrator, ob Sie diese Einstellungen ändern müssen."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -623,7 +636,7 @@ msgstr ""
 "Wenn Sie dieses Feld leer lassen, beginnt die Suche an der Wurzel des "
 "Verzeichnisbaums."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -639,11 +652,13 @@ 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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -654,7 +669,7 @@ msgstr ""
 "kontaktieren Sie Ihren Systemadministrator falls Sie Hilfe\n"
 "dabei brauchen, an diese Informationen zu gelangen."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -662,16 +677,17 @@ msgstr ""
 "Dies ist der vollständige Name des LDAP-Servers. Zum Beispiel: »ldap."
 "meinefirma.de«."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Dies ist die maximale Anzahl herunterzuladender Einträge. Wenn diese\n"
 "Zahl zu hoch angesetzt ist, werden Vorgänge im Adressbuch verlangsamt."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -681,7 +697,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -691,7 +707,7 @@ msgstr ""
 "angezeigt wird.\n"
 "Er dient lediglich zu Anzeigezwecken. "
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -700,7 +716,7 @@ msgstr ""
 "Dieser Name wird in der Ordnerliste von Evolution angezeigt und daher "
 "lediglich zu Anzeigezwecken verwendet."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -712,28 +728,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TSL verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (EN) verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Immer, wenn möglich"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -745,19 +761,19 @@ msgstr ""
 "Bitte fragen Sie Ihren Systemadministrator, wenn Sie sich bei diesen "
 "Einstellungen nicht sicher sind."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Angezeigter _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Download-Begrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -766,39 +782,39 @@ msgstr "_Download-Begrenzung:"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Anmeldemethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Port-Nummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "Such_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Zeitüberschreitung (Minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "Karten"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -913,7 +929,7 @@ msgstr "Zusammenarbeit"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -1008,10 +1024,10 @@ msgstr "Ka_tegorien..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1059,15 +1075,15 @@ msgid "_Web page address:"
 msgstr "_Web-Adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2052,103 +2068,112 @@ msgid "AOL Instant Messenger"
 msgstr "AOL-Instant-Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Dienst"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Ort"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Benutzername"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Privat"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Geschäftlich"
 
 # CHECK
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Weitere"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Geändert"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Kontoname"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Der Kategorieeditor ist nicht verfügbar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Kontakt als VCard speichern"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2156,7 +2181,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontakte löschen wollen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2164,46 +2189,51 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Voller Name:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_Mail:"
 
@@ -2361,11 +2391,11 @@ msgid "Is New List"
 msgstr "Ist neue Liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -2455,13 +2485,13 @@ msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
@@ -2478,101 +2508,100 @@ msgid "Type"
 msgstr "Typ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Adressbuch"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Neuer Kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Neue Kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Gehe zu Ordner..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importvorgang..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Nach Kontakten suchen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbuchquellen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressbuch..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressbuch..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopieren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2585,8 +2614,8 @@ msgstr ""
 "können"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -2629,7 +2658,7 @@ msgid "Company Phone"
 msgstr "Firmentelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-Mail"
 
@@ -2688,7 +2717,7 @@ msgid "Nickname"
 msgstr "Spitzname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Notiz"
 
@@ -2697,7 +2726,7 @@ msgid "Office"
 msgstr "Büro"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2824,67 +2853,73 @@ msgstr "Gewählt"
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Beschreibung"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "V_ideokonforenz-URL:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Persönlich"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Homepage"
 
@@ -2893,8 +2928,8 @@ msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2924,7 +2959,7 @@ msgstr "Protokoll nicht unterstützt"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2944,7 +2979,8 @@ msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adressbuch existiert nicht"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3082,7 +3118,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Adresse zu bestehendem Kontakt »%s« hinzufügen"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Anfrage beim Adressbuch..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3137,17 +3174,40 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Dies sollte das Rückfloss-Leinwandobjekt testen"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution-Elm-Importeur"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution-iCalendar-Importeur"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution-vCalendar-Importeur"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Kontakt drucken"
 
@@ -3239,7 +3299,7 @@ msgstr "Ränder"
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Optionen"
 
@@ -3418,8 +3478,8 @@ msgstr "Kein Dateiname angegeben."
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
@@ -3498,10 +3558,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution-Aufgabenkomponente"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Aufgaben"
 
@@ -3545,27 +3604,25 @@ msgstr "Schlummerzeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "Ö_ffnen"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Öffnen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
 # CHECK
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3577,12 +3634,12 @@ msgstr ""
 "%sBeginnt um %s\n"
 "Endet um %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3595,7 +3652,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3612,19 +3669,19 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarmbenachrichtigungsdienst konnte nicht erstellt werden"
 
@@ -3762,25 +3819,31 @@ msgstr "Zeiten im 24-Stunden- und nicht im »AM/PM«-Format anzeigen"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Beschreibung enthält"
+
 # CHECK
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3809,7 +3872,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3831,74 +3894,74 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Ganztagstermin"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "Ka_lender"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, 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:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Es ist kein Kalender zum Anlegen von Ereignissen und Treffen verfügbar"
 
@@ -4030,7 +4093,7 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Aktion/Auslöser"
 
@@ -4102,7 +4165,7 @@ msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -4113,7 +4176,7 @@ msgstr "Beginn des Termins"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -4163,7 +4226,7 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alarme"
 
@@ -4188,7 +4251,7 @@ msgid "Days"
 msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Aktivieren"
 
@@ -4328,7 +4391,7 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4430,7 +4493,7 @@ msgstr ""
 "vorgenommenen Einstellungen zu speichern."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
@@ -4605,23 +4668,23 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " bis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Fällig am "
 
@@ -4657,8 +4720,8 @@ msgstr "Journaleintrag - %s"
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Speichern unter..."
 
@@ -4689,10 +4752,21 @@ msgid "Destination is read only"
 msgstr ""
 
 # CHECK
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Wählen Sie eine Zielquelle"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Neue Aufgabenliste"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4804,7 +4878,7 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Termin"
 
@@ -4828,23 +4902,32 @@ msgstr "Planung"
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Das Fälligkeitsdatum liegt vor dem Anfangsdatum!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
@@ -4920,29 +5003,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -5134,7 +5217,7 @@ msgstr "am"
 msgid "occurrences"
 msgstr "Treffer"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -5167,7 +5250,7 @@ msgid "_No recurrence"
 msgstr "_Keine Wiederholung"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -5210,7 +5293,7 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
@@ -5239,7 +5322,7 @@ msgstr ""
 "Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
 "verschicken?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
@@ -5252,7 +5335,7 @@ msgstr "% _abgeschlossen"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -5265,7 +5348,7 @@ msgstr "Hoch"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
@@ -5284,7 +5367,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -5323,16 +5406,16 @@ msgstr "Grundlegend"
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Das Fälligkeitsdatum liegt vor dem Anfangsdatum!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
@@ -5343,7 +5426,7 @@ msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -5528,11 +5611,10 @@ msgstr "Anfangsdatum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "Farbe"
 
@@ -5557,7 +5639,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "O"
 
@@ -5592,10 +5674,10 @@ msgstr "Nein"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -5608,99 +5690,105 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "Ö_ffnen"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Speichern unter..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Diesen _Treffer löschen"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "_Alle Treffer löschen"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
@@ -5787,7 +5875,7 @@ msgid "Alarms"
 msgstr "Alarme"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5846,26 +5934,26 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "PM"
@@ -6050,7 +6138,7 @@ msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -6511,12 +6599,12 @@ msgstr "Priorität:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6526,7 +6614,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6537,12 +6625,12 @@ msgstr ""
 "%s\n"
 " ist abgestürzt."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6551,28 +6639,38 @@ msgstr ""
 "Fehler beim Öffnen von %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Aufgaben werden geladen"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Termin - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6695,16 +6793,16 @@ msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Geben Sie das Passwort für %s ein"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6716,7 +6814,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6728,12 +6826,12 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Im Web"
 
@@ -6922,49 +7020,49 @@ msgstr "Gewählter Monat (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Aufgabe"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -6975,38 +7073,38 @@ msgstr ""
 "Die Aufgabenliste »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Aufgabenliste"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, 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:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
@@ -7064,20 +7162,20 @@ msgstr "iCalendar-Dateien (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-Dateien (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Alte Termine und Besprechungen löschen"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Erinnerung!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7085,7 +7183,7 @@ msgstr ""
 "Evolution hat Gnome Calendar-Dateien gefunden.\n"
 "Möchten Sie diese in Evolution importieren?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -8747,7 +8845,7 @@ msgstr "Nachricht konnte nicht geöffnet werden"
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
@@ -8833,7 +8931,7 @@ msgstr "Nachrichten werden kopiert"
 msgid "Filtering new message(s)"
 msgstr "Neue Nachricht(en) wird/werden gefiltert"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8844,18 +8942,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 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:747
+#: camel/camel-gpg-context.c:748
 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:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8864,34 +8962,30 @@ msgstr ""
 "Für das Entsperren des Schlüssels für den\n"
 "Benutzer %s ist ein Passwort erforderlich."
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Abgesagt."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete GnuPG-Antwort: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Keine Daten angegeben"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 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:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8902,34 +8996,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s gescheitert: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg konnte nicht ausgeführt werden: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "gpg konnte nicht ausgeführt werden."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
@@ -8937,27 +9031,27 @@ msgstr ""
 "Nachrichtensignatur konnte nicht verifiziert werden: Nachrichtenformat "
 "fehlerhaft"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Verschlüsselungsdaten konnten nicht erzeugt werden: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Dies ist ein digital verschlüsselter Nachrichtenteil"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Syntax des Nachrichteninhalts konnte nicht analysiert werden"
 
@@ -9069,23 +9163,36 @@ msgstr "MIME-Teil konnte nicht entschlüsselt werden: Ungültige Struktur"
 msgid "parse error"
 msgstr "Fehler bei der Syntaxanalyse"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "E-Mail-Treiber: Virtueller Ordner"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s konnte nicht geladen werden: Laden von Modulen wird von diesem System "
 "nicht unterstützt."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s konnte nicht geladen werden: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Kein Treiber für Protokoll »%s« verfügbar"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonym"
@@ -9260,7 +9367,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Fehlerhafte Legitimationsantwort vom Server."
 
@@ -9400,20 +9507,7 @@ msgstr "Finden eines Rechners gescheitert: Rechner nicht gefunden"
 msgid "Host lookup failed: unknown reason"
 msgstr "Finden eines Rechners gescheitert: unbekannter Grund"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "E-Mail-Treiber: Virtueller Ordner"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Kein Treiber für Protokoll »%s« verfügbar"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9479,22 +9573,26 @@ msgstr ""
 "Auf Ordner konnte nicht zugegriffen werden: Ungültiger Vorgang auf diesem "
 "Speicher"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner konnte nicht angelegt werden: Ungültiger Vorgang auf diesem Speicher"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Müll"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Unerwünscht"
@@ -9729,21 +9827,31 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Nachrichten können nicht aus NNTP-Ordnern kopiert werden!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9759,14 +9867,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Filter auf neue Nachrichten im Eingang dieses Servers anwenden"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Entfernte E-Mails automatisch lokal synchronisieren"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Adressbuch"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "Name des LDAP-Servers:"
@@ -9785,44 +9889,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Zum Zugriff auf Novell Groupwise-Server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Passwort"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dies stellt unter Verwendung eines unverschlüsselten Passworts eine "
 "Verbindung mit dem IMAP-Server her."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Vorgabe"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Liste"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server-Verbindung unerwartet getrennt: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9831,26 +9933,26 @@ msgstr ""
 "Alarm von IMAP-Server %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu früh."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Informationen"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
@@ -9865,7 +9967,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerstört und auf dem Serverneu angelegt."
 
@@ -9874,12 +9976,12 @@ msgstr "Der Ordner wurde zerstört und auf dem Serverneu angelegt."
 msgid "Scanning for changed messages"
 msgstr "Nach geänderten Nachrichten suchen"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nachricht konnte nicht abgerufen werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9895,25 +9997,25 @@ msgstr ""
 "Nachricht konnte nicht abgerufen werden: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzeit nicht verfügbar"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Zusammenfassungsinformationen für neue Nachrichten werden abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -9968,27 +10070,37 @@ msgstr "Namensraum"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "In allen Ordnern nach neuen E-Mails sehen"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "In allen Ordnern nach neuen E-Mails sehen"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9997,64 +10109,64 @@ msgstr "IMAP-Dienst für %s auf %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung mit %s (Port %d) gescheitert: %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-»Verhandlungen« gescheitert"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10065,24 +10177,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s existiert nicht"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Elternerdner: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -10108,7 +10228,7 @@ msgstr ""
 "\n"
 " !!! VERWENDEN SIE DIES NICHT FÜR DEN PRODUKTIVEN EINSATZ !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden"
@@ -10192,8 +10312,8 @@ msgstr ""
 "verwendet werden."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10205,55 +10325,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Eingangsordner"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale E-Mail-Datei %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Ordner-Metadatei »%s« konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Zusammenfassung konnte nicht gespeichert werden: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht konnte nicht zur Zusammenfassung hinzugefügt werden: Grund "
@@ -10273,53 +10393,44 @@ msgstr "Nachricht konnte nicht an Maildir-Ordner angehängt werden: %s: %s"
 msgid "Invalid message contents"
 msgstr "Ungültiger Inhalt der Nachricht"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner »%s« konnte nicht geöffnet werden:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Ordner »%s« existiert nicht."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner »%s« konnte nicht angelegt werden:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "»%s« ist kein Maildir-Verzeichnis."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "kein Maildir-Verzeichnis"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10341,9 +10452,9 @@ msgid "Checking for new messages"
 msgstr "Nach neuen Nachrichten sehen"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
@@ -10387,160 +10498,138 @@ msgstr "Dieser Ordner scheint irreparabel beschädigt zu sein."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erstellen der Nachricht gescheitert: Fehlerhaftes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Datei »%s« konnte nicht geöffnet werden:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Es konnte kein Ordner mit diesem Namen angelegt werden."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Verzeichnis »%s« konnte nicht angelegt werden:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Datei »%s« konnte nicht angelegt werden:\n"
+"Ordner »%s« konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "»%s« ist keine reguläre Datei."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner »%s« konnte nicht gelöscht werden:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner »%s« ist nicht leer. Nicht gelöscht."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Es konnte kein Ordner mit diesem Namen angelegt werden."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Der neue Ordnername ist nicht zulässig."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ordner konnte nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Schwerwiegender Fehler beim Analysieren der E-Mail-Syntax nahe Position %ld "
 "in Ordner %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner konnte nicht geprüft werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Datei konnte nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäres Postfach konnte nicht angelegt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassung und Order stimmen nicht überein, sogar nach einer "
 "Synchronisierung"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ordner konnte nicht gespeichert werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben in temporäres Postfach: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben in temporäres Postfach %s: %s"
@@ -10554,10 +10643,17 @@ msgstr "Anhängen der Nachricht mit MH abgebrochen"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht konnte nicht an mh-Ordner angehängt werden: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Ordner »%s« konnte nicht angelegt werden:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "»%s« ist kein Verzeichnis."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10580,6 +10676,29 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner »%s/%s« existiert nicht."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Ordner »%s« konnte nicht geöffnet werden:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Ordner »%s« existiert nicht."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Ordner »%s« konnte nicht angelegt werden:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10822,46 +10941,46 @@ msgstr ""
 "Sie können in Newsgroups keine Ordner entfernen: Bestellen Sie sie "
 "stattdessen ab."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Verbindungsfehler: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ordner existiert nicht: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Gruppe konnte nicht ermittelt werden: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Nachrichten konnten nicht abgerufen werden: unbekannter Fehler"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Befehl gescheitert: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: neue Nachrichten werden eingelesen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Unbekannte Serverrückmeldung: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Abbrechen verwenden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Vorgang gescheitert: %s"
@@ -10908,7 +11027,7 @@ msgstr "Nach %s Tag(en) löschen"
 msgid "Disable support for all POP3 extensions"
 msgstr "Jegliche Unterstützung von POP3-Erweiterungen deaktivieren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11002,7 +11121,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner »%s« existiert nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11058,7 +11177,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-Mail-Zustellung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11229,7 +11348,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
@@ -11338,34 +11457,34 @@ msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
 msgid "QUIT response error"
 msgstr "Fehler bei QUIT-Antwort"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f kB"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f MB"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Die gewählten Objekte aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -11482,14 +11601,14 @@ msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11497,7 +11616,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für Absenderkonto festgelegt"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11506,30 +11625,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11538,7 +11657,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11547,7 +11666,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11556,7 +11675,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11565,7 +11684,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11574,7 +11693,7 @@ msgstr ""
 "gefunden.\n"
 "Soll versucht werden, diese wiederherzustellen?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11585,43 +11704,43 @@ msgstr ""
 "\n"
 "Wollen Sie die Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, 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:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "A_nlagenleiste verbergen (legen Sie Anlagen hier ab)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "A_nlagenleiste anzeigen (legen Sie Anlagen hier ab)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11629,7 +11748,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Bedienelement »Auswähler« konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11641,7 +11760,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11649,7 +11768,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12004,7 +12123,7 @@ msgstr "Dann"
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Ordner wählen"
@@ -12019,19 +12138,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Wichtig"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Später"
 
@@ -12121,7 +12240,7 @@ msgstr ""
 "Das Datum der Nachricht wird mit dem Datum\n"
 "verglichen, an dem der Filter angewandt wird."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
@@ -12137,7 +12256,7 @@ msgstr "in der Vergangenheit"
 msgid "months"
 msgstr "Monate"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -12306,7 +12425,7 @@ msgstr "ist nicht markiert"
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Beschriftung"
@@ -12412,9 +12531,10 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Betreff"
 
@@ -12422,25 +12542,25 @@ msgstr "Betreff"
 msgid "Unset Status"
 msgstr "Status nicht setzen"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelname »%s« ist nicht eindeutig. Wählen Sie einen anderen."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regeln"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Regel hinzufügen"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Regelname "
 
@@ -12480,15 +12600,15 @@ msgstr "Betreff enthält"
 msgid "Subject does not contain"
 msgstr "Betreff enthält nicht"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Der VOrdner muss benannt werden."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie müssen mindestens einen Ordner als Quelle angeben."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "VOrdner-Quelle"
 
@@ -12541,9 +12661,9 @@ msgstr "Evolution-E-Mail-Ordnerbetrachter"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -12551,7 +12671,7 @@ msgstr "E-Mail"
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
@@ -12589,15 +12709,15 @@ msgstr "Sie müssen einen gültigen Namen für das Skript angeben."
 msgid "[script]"
 msgstr "[Skript]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Skript-Signatur hinzufügen"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
@@ -12682,7 +12802,6 @@ msgid "Unread messages"
 msgstr "Ungelesene Nachrichten"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
@@ -12690,296 +12809,314 @@ msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Auf diesem Computer"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Eingang"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Ladevorgang..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ordner konnte nicht gelöscht werden: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Ordner »%s« und alle Unterordner wirklich löschen?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "»%s« löschen"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
 "anderen Namen."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Verschieben"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Antwort an _Liste"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Antwort an a_lle"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Als u_nerwünscht markieren"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "Lösche_n rückgängig"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzufügen"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht anlegen"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Abse_nder"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über _Empfänger"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "VOrdner über Thread"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filter über Thread"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Vorgabe"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12987,11 +13124,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:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte nicht verifiziert werden"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12999,12 +13136,12 @@ 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
 # CHECK
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -13012,12 +13149,12 @@ 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:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
 # CHECK
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -13027,11 +13164,11 @@ 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13039,11 +13176,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -13053,36 +13190,36 @@ msgstr ""
 "verschlüsselt. Daher können dritte ihren inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: mail/em-format-html-display.c:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "An _Ort und Stelle anzeigen"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
@@ -13125,29 +13262,34 @@ msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Von"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -13161,8 +13303,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13181,21 +13323,26 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spam-Assassin (eingebaut)"
 
@@ -13211,56 +13358,56 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "POP3-UID-Zwischenspeicher konnten nicht migriert werden: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Ordner-Ausklappstatus konnte nicht migriert werden: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Öffnen von Speicher für »%s« fehlgeschlagen: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "_Nachricht schicken an..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "Zum Adressbuch _hinzufügen"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen..."
@@ -13308,17 +13455,17 @@ msgstr "Filter"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Am %a, den %d.%m.%Y schrieb %%s um %k:%M Uhr %%+05d:"
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13327,7 +13474,7 @@ msgstr ""
 "In »%s« konnte nicht gespeichert werden:\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13336,29 +13483,35 @@ msgstr ""
 "»%s« existiert bereits.\n"
 "Überschreiben?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "Nachricht"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fehler: »%s« existiert und ist keine reguläre Datei"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Nachricht speichern..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "E-Mail von %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13370,7 +13523,7 @@ msgstr ""
 "Falls Sie fortfahren, können Sie diese Nachrichten nicht wiederherstellen.\n"
 "Sollen diese Nachrichten wirklich entfernt werden?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13395,85 +13548,97 @@ 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 "Check incoming mail being junk for IMAP accounts"
-msgstr ""
-"Eingehende E-Mails in IMAP-Konten daraufhin überprüfen, ob sie unerwünscht "
-"sind"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Hervorhebungsfarbe für Zitate"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Hervorhebungsfarbe für Zitate."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Vorgabebetreff für die Nachricht."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Vorgabebetreff für die Nachricht."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Vorgabebreite des Ordnerleistenfelds"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Vorgabebreite des Ordnerleistenfelds"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Caret-Modus aktivieren, sodass beim Lesen von E-Mails ein Cursor angezeigt "
 "wird."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Caret-Modus aktivieren/deaktivieren"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
 # CHECK - etwas holprig
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13484,15 +13649,15 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Liste mit Beschriftungen und den assoziierten Farben"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13501,12 +13666,12 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:29
 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:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13516,17 +13681,17 @@ msgstr ""
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 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:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13535,84 +13700,84 @@ 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kenzeichnen"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kenzeichnen."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 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:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Klangdatei zur Benachrichtigung bei neuen E-Mails"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Benachrichtigungstyp bei neuen E-Mails"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 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:46
+#: mail/evolution-mail.schemas.in.in.h:49
 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:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 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:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13620,105 +13785,97 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 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:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 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:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Unerwünscht-Test auf eingehende E-Mails bei IMAP-Konten anwenden (greift "
-"nur, falls »check_incoming« wahr ist)"
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "G3h31m-0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "G3h31m-0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Beim Eintreffen neuer E-Mails wiederzugebende Klangdatei."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Legt den Typ der Benachrichtigung bei neuen E-Mails fest, den der Benutzer "
 "verwenden möchte."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite"
 
 # CHECK
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13730,100 +13887,100 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Spamassassin-Daemon und -Client verwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin-Daemon und -Client verwenden (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Ansicht/Von-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Ansicht/Von-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13831,69 +13988,66 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "Port zum Ausführen des vom Benutzer ausgeführten spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "spamd-Port"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution-MBox-Importeur"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importieren..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importieren von %s als %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s wird eingelesen"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Dateien werden importiert"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13901,16 +14055,44 @@ msgstr ""
 "Evolution hat Elm-E-Mail-Dateien gefunden.\n"
 "Möchten Sie diese in Evolution importieren?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "_Entwurfsordner:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Wählen Sie ein zu importierendes Zertifikat..."
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importieren"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Dateien werden importiert"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "%s wird eingelesen"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritätsfilter »%s«"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13939,7 +14121,7 @@ msgstr ""
 "Überprüfen Sie die importierten Filter, um sicherzustellen,\n"
 "dass alles erwartungsgemäß funktioniert."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13952,7 +14134,7 @@ msgstr ""
 "unterstützt.\n"
 "Diese Filter gehen verloren."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13967,31 +14149,24 @@ msgstr ""
 "sie nun prüfen, ob diese Zeichenfolge im\n"
 "Nachrichtenrumpf enthalten ist oder nicht."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "E-Mail-Filter werden eingelesen"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Verzeichnis wird eingelesen"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Import beginnt"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "E-Mail-Filter"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13999,11 +14174,20 @@ msgstr ""
 "Evolution hat Netscape-E-Mail-Dateien gefunden.\n"
 "Möchten Sie diese in Evolution importieren?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importiert Ihre alten Pine-Daten"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Dateien werden importiert"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adressbuch"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14011,7 +14195,7 @@ msgstr ""
 "Evolution hat Pine-E-Mail-Dateien gefunden.\n"
 "Möchten Sie diese in Evolution importieren?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14055,19 +14239,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution-Konteneditor"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pfad:"
 
@@ -14119,27 +14303,42 @@ msgstr ""
 "    »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Neuer VOrdner"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-Mail-Filter"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Einen neuen Kalender anlegen"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI der E-Mail-Quelle, die diese Ansicht anzeigt"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identität"
 
@@ -14184,7 +14383,7 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
@@ -14213,123 +14412,119 @@ msgid "Connecting to server..."
 msgstr "Verbindung mit Server wird hergestellt..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL wird von diesem Evolution-Build nicht unterstützt)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wird von diesem Evolution-Build nicht unterstützt)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Angezeigte E-Mail-Kopfzeilen</b>"
 
 # CHECK
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor dem Benutzer selbst "
 "verschlüsseln"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontoinformationen"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Sk_ript hinzufügen"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Signatur hinzufügen..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "_Blindkopie immer schicken an:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "_Kopie immer schicken an:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Originalnachricht anhängen"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Farben"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "_Eingehende E-Mails überprüfen"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 "Die Rechtschreibprüfung _unmittelbar beim Eingeben der Zeichen durchführen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Überprüft, ob eingehende Nachrichten unerwünscht sind"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falsch geschriebene Wörter:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Nachrichten verfassen"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14347,139 +14542,135 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Vorgabeverhalten"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Voreingestellte Zeichen_kodierung:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "E-Mail wird gelöscht"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "Eingehende E-Mails bei IMAP-Konten _nicht überprüfen"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Entwurfsordner:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_E-Mail-Adresse:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Müllordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "_Verschlüsselungszertifikat:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Befehl ausführen..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Dicktengleich:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Filtereinstellungen"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Kopfzeilen"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Beschriftungen und Farben"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Bilder werden geladen"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Nachrichteneditor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Nachrichtenschrift"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "E-Mail-Benachrichtigung"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14487,141 +14678,141 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionale Informationen"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Druckschriftarten"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail-Maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Dieses Passwort _speichern"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Dieses _Passwort speichern"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Benötigte Informationen"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Vorgaben wiederherstellen"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Sich_erheit"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sichere MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "HTML-Proprtionalschrift wählen"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in »Verschickt« und »Entwürfe«"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server-_Typ: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "_Signaturzertifikat:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Rechtschreibprüfung"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard-UNIX-mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14631,7 +14822,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zu Anzeigezwecken verwendet."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14641,7 +14832,7 @@ msgstr ""
 "konfigurieren. Diese Sprachliste enthält ausschließlich die Sprachen, für "
 "die ein Wörterbuch installiert sind."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14649,15 +14840,15 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Arbeit« oder »Persönlich«."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "_Daemon verwenden"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14667,173 +14858,173 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Weiter«, um zu beginnen."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Beim Verwenden dieses Kontos ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "L_egitimationstyp: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Legitimationstyp: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Smiley-Bilder _automatisch einfügen"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Piepston ausgeben"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Beim Säubern eines Ordners _rückfragen"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Vorgabesignatur:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Beim Eintreffen neuer E-Mails nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlüsseln (per Vorgabe)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML-E-Mail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identität"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Unerwünscht"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "Bilder _laden, falls der Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Ausschließlich _lokale Tests"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Klangdatei abspielen"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Abrufen von E-Mails"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Auf Vorgaben _zurücksetzen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Auswählen..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Verschicken von E-Mails"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standard-Schrift:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminal-Schrift:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -14857,7 +15048,7 @@ msgstr ""
 "Fehler bei folgendem Vorgang:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Arbeitet"
 
@@ -14869,12 +15060,12 @@ msgstr "Ordner wird gefiltert"
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14883,116 +15074,116 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "»%s« wird verschickt"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) wird/werden abgerufen"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) wird/werden gespeichert"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15001,7 +15192,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15010,11 +15201,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15023,22 +15214,22 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Unerwünscht-Status wird verändert"
 
@@ -15070,38 +15261,38 @@ msgstr "Verschlüsselung"
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Absagevorgang..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "E-Mails abrufen und verschicken"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Warten..."
 
@@ -15211,21 +15402,21 @@ msgstr ""
 "   »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner »%s« zu bearbeiten, der nicht existiert."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
@@ -15550,97 +15741,20 @@ msgstr "Offline-Ordner"
 msgid "Autocompletion Folders"
 msgstr "Ordner für Auto-Vervollständigung"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Ordner konnte nicht kopiert werden: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Ordner konnte nicht verschoben werden: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Ein Ordner kann nicht in sich selbst verschoben werden."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Ein Ordner kann nicht in sich selbst kopiert werden."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Geben Sie den Ordner an, in den Ordner »%s« kopiert werden soll:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Ordner kopieren"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Geben Sie einen Ordner an, in den Ordner »%s« verschoben werden soll:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Ordner verschieben"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Ordner konnte nicht gelöscht werden:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Ordner »%s« wirklich löschen?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Ordner konnte nicht umbenannt werden:\n"
+"Der angegebene Ordner konnte nicht angelegt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Der angegebene Ordnername ist nicht gültig: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Der gewählte Ordner gehört keinem anderen Benutzer"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Ordner konnte nicht entfernt werden:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Der angegebene Ordner konnte nicht angelegt werden:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namenlos)"
@@ -15781,7 +15895,7 @@ msgstr "gpg konnte nicht ausgeführt werden."
 msgid "_Import"
 msgstr "_Importieren"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
@@ -15819,6 +15933,10 @@ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Import beginnt"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15938,125 +16056,6 @@ msgstr "Konfigurationsdatenbank nicht gefunden"
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Neue Verknüpfungsgruppe anlegen"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Gruppenname:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Wollen Sie die Gruppe »%s« wirklich aus der Verknüpfungsleiste entfernen?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Verknüpfungsgruppe umbenennen"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Die gewählte Verknüpfungsgruppe umbenennen in:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Kleine Symbole"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Die Verknüpfungen als kleine Symbole anzeigen"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Große Symbole"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Die Verknüpfungen als große Symbole anzeigen"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "Gruppe _hinzufügen..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Eine neue Verknüpfungsgruppe anlegen"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Diese Gruppe _entfernen..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Diese Verknüpfungsgruppe entfernen"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Diese Gruppe _umbenennen..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Diese Verknüpfungsgruppe umbenennen"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Die Verknüpfungsleiste _verbergen"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Die Verknüpfungsleiste verbergen"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "_Vorgabe-Verknüpfungen anlegen"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Vorgabe-Verknüpfungen anlegen"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Verknüpfung umbenennen"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Die gewählte Verknüpfung umbenennen in:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Den mit dieser Verknüpfung verbundenen Ordner öffnen"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "In neuem _Fenster öffnen"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-"Den mit dieser Verknüpfung verbundenen Ordner in einem neuen Fenster öffnen"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Diese Verknüpfung umbenennen"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Entfernen"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Verknüpfungen"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kontrollkästchen"
@@ -16067,11 +16066,6 @@ msgstr "Kontrollkästchen"
 msgid "New"
 msgstr "Neu"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "»%s« in »%s«"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16381,45 +16375,45 @@ msgstr ""
 "%s: --online und --offline können nicht gemeinsam übergeben werden.\n"
 " Verwenden Sie %s --help, um weitere Informationen zu erhalten.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Wählen Sie ein zu importierendes Zertifikat..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Zertifikatname"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Verwendungszwecke"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Läuft aus"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Zertifikatbetrachter: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Geben Sie das Passwort für »%s« ein"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16428,7 +16422,7 @@ msgstr ""
 "Ausgestellt auf:\n"
 "      Empfänger: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16496,7 +16490,7 @@ msgstr ""
 "Sie sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
 "möglich)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Zertifikat"
 
@@ -16561,11 +16555,11 @@ msgstr "Organisationseinheit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-Fingerabdruck"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL-Client-Zertifikat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL-Server-Zertifikat"
 
@@ -16614,211 +16608,211 @@ msgstr "Sie haben Zertifikate, die folgende Personen identifizieren:"
 msgid "Your Certificates"
 msgstr "Ihre Zertifikate"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Version"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Version 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Version 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Version 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 mit RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 mit RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 mit RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1-RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Verwendungszweck des Zertifikatsschlüssels"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Netscape-Zertifikattyp"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Schlüsselidentifikator der Zertifizierungsstelle"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Algorithmusidentifikator"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Algorithmus-Parameter"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Infos zum öffentlichen Empfängerschlüssel"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Algorithmus des öffentlichen Empfängerschlüssels"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Öffentlicher Schlüssel des Empfängers"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Fehler: Erweiterung konnte nicht verarbeitet werden"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Objektunterzeichner"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "SSL-Zertifizierungsstelle"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "E-Mail-Zertifizierungsstelle"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Signieren"
 
 # CHECK
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "Unleugbarkeit"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Schlüsselverschlüsselung"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Datenverschlüsselung"
 
 # CHECK gibt's ne Übersetzung für diese Methode?
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Key-Agreement"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Zertifikatunterzeichner"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "CRL-Unterzeichner"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Kritisch"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Nicht-kritisch"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithmus der Zertifikatsignatur"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "Eindeutige Ausstellerkennung"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "Eindeutige Empfängerkennung"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Wert der Zertifikatsignatur"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12-Dateipasswort"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Geben Sie das Passwort für die PKCS12-Datei ein:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Importierte Zertifikate"
 
@@ -17407,7 +17401,8 @@ msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads sortieren"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Absender zum Adressbuch _hinzufügen"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17415,7 +17410,8 @@ msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17863,10 +17859,6 @@ msgstr "_Format"
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Öffnen"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
@@ -18229,22 +18221,6 @@ msgstr "_Verschicken/Abrufen"
 msgid "_Window"
 msgstr "_Fenster"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Zusammenfassung drucken"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Zusammenfassung drucken"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Neu laden"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Die Ansicht neu laden"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Nach _Firma"
@@ -18305,8 +18281,8 @@ msgstr "Mit _Kategorie"
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18553,23 +18529,23 @@ msgstr "_Suchen"
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Löschen"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Kennung des Unterobjekts"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "_Jetzt suchen"
 
@@ -18583,6 +18559,226 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 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"
+#~ msgstr ""
+#~ "Datei »%s« konnte nicht geöffnet werden:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verzeichnis »%s« konnte nicht angelegt werden:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Datei »%s« konnte nicht angelegt werden:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "»%s« ist kein Verzeichnis."
+
+#~ msgid "On this Computer"
+#~ msgstr "Auf diesem Computer"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr ""
+#~ "Eingehende E-Mails in IMAP-Konten daraufhin überprüfen, ob sie "
+#~ "unerwünscht sind"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Unerwünscht-Test auf eingehende E-Mails bei IMAP-Konten anwenden (greift "
+#~ "nur, falls »check_incoming« wahr ist)"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importieren von %s als %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "E-Mail-Filter werden eingelesen"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Verzeichnis wird eingelesen"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "Eingehende E-Mails bei IMAP-Konten _nicht überprüfen"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Ordner konnte nicht kopiert werden: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Ordner konnte nicht verschoben werden: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Ein Ordner kann nicht in sich selbst verschoben werden."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Ein Ordner kann nicht in sich selbst kopiert werden."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Geben Sie den Ordner an, in den Ordner »%s« kopiert werden soll:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Ordner kopieren"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr ""
+#~ "Geben Sie einen Ordner an, in den Ordner »%s« verschoben werden soll:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Ordner verschieben"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ordner konnte nicht gelöscht werden:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Ordner »%s« wirklich löschen?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ordner konnte nicht umbenannt werden:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Der gewählte Ordner gehört keinem anderen Benutzer"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ordner konnte nicht entfernt werden:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Neue Verknüpfungsgruppe anlegen"
+
+#~ msgid "Group name:"
+#~ msgstr "Gruppenname:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Wollen Sie die Gruppe »%s« wirklich aus der Verknüpfungsleiste entfernen?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Verknüpfungsgruppe umbenennen"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Die gewählte Verknüpfungsgruppe umbenennen in:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Kleine Symbole"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Die Verknüpfungen als kleine Symbole anzeigen"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Große Symbole"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Die Verknüpfungen als große Symbole anzeigen"
+
+#~ msgid "_Add Group..."
+#~ msgstr "Gruppe _hinzufügen..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Eine neue Verknüpfungsgruppe anlegen"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Diese Gruppe _entfernen..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Diese Verknüpfungsgruppe entfernen"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Diese Gruppe _umbenennen..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Diese Verknüpfungsgruppe umbenennen"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Die Verknüpfungsleiste _verbergen"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Die Verknüpfungsleiste verbergen"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "_Vorgabe-Verknüpfungen anlegen"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Vorgabe-Verknüpfungen anlegen"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Verknüpfung umbenennen"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Die gewählte Verknüpfung umbenennen in:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Den mit dieser Verknüpfung verbundenen Ordner öffnen"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "In neuem _Fenster öffnen"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr ""
+#~ "Den mit dieser Verknüpfung verbundenen Ordner in einem neuen Fenster "
+#~ "öffnen"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Diese Verknüpfung umbenennen"
+
+#~ msgid "Re_move"
+#~ msgstr "_Entfernen"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Fehler beim Speichern von Verknüpfungen."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Verknüpfungen"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "»%s« in »%s«"
+
+#~ msgid "Print Summary"
+#~ msgstr "Zusammenfassung drucken"
+
+#~ msgid "Print summary"
+#~ msgstr "Zusammenfassung drucken"
+
+#~ msgid "Reload"
+#~ msgstr "Neu laden"
+
+#~ msgid "Reload the view"
+#~ msgstr "Die Ansicht neu laden"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "In Ordner kopieren..."
 
diff --git a/po/el.po b/po/el.po
index 94d1579d55..cc864cf69d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -34,14 +34,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-02 21:54+0200\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-03-02 22:06+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\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"
 "X-Generator: KBabel 1.0.2\n"
 
@@ -57,7 +57,8 @@ msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήρι
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
 msgid "Could not read pilot's Address application block"
-msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -117,17 +118,18 @@ msgstr "Έλεγχος ρυθμίσεων φακέλου του Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Διαχείριση των πιστοποιητικών  S/Mime εδώ"
 
-#: addressbook/gui/component/addressbook-component.c:222
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: addressbook/gui/component/addressbook-component.c:281
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Νέο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook-component.c:282
+#: addressbook/gui/component/addressbook-component.c:309
 #: addressbook/gui/widgets/e-addressbook-view.c:1074
 #: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
@@ -137,60 +139,60 @@ msgstr "Νέο Βιβλίο Διευθύνσεων"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/component/addressbook-component.c:283
+#: addressbook/gui/component/addressbook-component.c:310
 #: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Νέα Επαφή"
 
-#: addressbook/gui/component/addressbook-component.c:528
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Επαφή"
 
-#: addressbook/gui/component/addressbook-component.c:529
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Δημιουργία νέας επαφής"
 
-#: addressbook/gui/component/addressbook-component.c:534
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Νέα Λίστα Επαφών"
 
-#: addressbook/gui/component/addressbook-component.c:535
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Λίστα Επαφών"
 
-#: addressbook/gui/component/addressbook-component.c:536
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Δημιουργία νέας λίστας επαφών"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Αδύνατη η δημιουργία ερωτήματος στο Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Η απάντηση του διακομιστή δεν περιείχε έγκυρο σχήμα πληροφοριών"
 
@@ -220,8 +222,8 @@ msgstr "Εισαγωγή  `%s':"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Σε αυτό τον υπολογιστή"
 
@@ -229,7 +231,7 @@ msgstr "Σε αυτό τον υπολογιστή"
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Προσωπικό"
 
@@ -394,7 +396,7 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -438,7 +440,7 @@ msgid "Address Book Sources"
 msgstr "Πηγές βιβλίου διευθύνσεων"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Πάντοτε"
 
@@ -478,7 +480,8 @@ msgstr ""
 "διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας στο "
 "διακομιστή"
@@ -501,7 +504,7 @@ msgid "Group:"
 msgstr "Ομάδα:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Ποτέ"
 
@@ -747,7 +750,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
-msgstr "Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
+msgstr ""
+"Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
 
 #: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
@@ -762,7 +766,7 @@ msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατό"
 
@@ -790,7 +794,7 @@ msgstr "Όριο _μεταφόρτωσης:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -1040,9 +1044,9 @@ msgstr "_Κατηγορίες..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2238
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
 #: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -2133,7 +2137,7 @@ msgstr "Οικία"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Εργασία"
 
@@ -2381,7 +2385,8 @@ msgstr "Λίστα _ονόματος:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr ""
+"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2494,13 +2499,13 @@ msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Η κατηγορία είναι"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
@@ -2621,7 +2626,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1607
-#: calendar/gui/cal-search-bar.c:353
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
 
@@ -3288,7 +3293,7 @@ msgstr "Περιθώρια"
 msgid "Number of columns:"
 msgstr "Αριθμός στηλών:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -3374,7 +3379,8 @@ msgstr "Δοκιμή εκτύπωσης επεξεργαστή στυλ επαφ
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr "Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφώ"
+msgstr ""
+"Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφώ"
 
 #: addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
@@ -3419,7 +3425,8 @@ msgid "Export in asynchronous mode "
 msgstr "Εξαγωγή σε ασύγχρονη κατάσταση"
 
 #: 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 ""
 "Ο αριθμός των καρτών σε ένα αρχείο αποτελέσματος σε ασύγχρονη κατάσταση, "
 "προεπιλεγμένο μέγεθος 100."
@@ -3429,7 +3436,8 @@ msgid "NUMBER"
 msgstr "ΑΡΙΘΜΟΣ"
 
 #: 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 ""
 "Σφάλμα παραμέτρων γραμμής εντολών, παρακαλώ χρησιμοποιήστε --help για να "
 "δείτε την χρήση."
@@ -3488,7 +3496,8 @@ msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
 #: calendar/conduits/calendar/calendar-conduit.c:1436
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
@@ -3497,7 +3506,8 @@ msgstr "Προκαθορισμένη Προτεραιότητα:"
 #: calendar/conduits/todo/todo-conduit.c:945
 #: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
@@ -3544,7 +3554,7 @@ msgid "Evolution's Tasks component"
 msgstr "Στοιχείο Εργασιών του Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3708,7 +3718,8 @@ msgstr "Ώρα έναρξης της εργάσιμης μέρας"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
-msgstr "Διαατήματα που προβάλλονται στις προβολές Ημέρας και εργάσιμης εβδομάδας"
+msgstr ""
+"Διαατήματα που προβάλλονται στις προβολές Ημέρας και εργάσιμης εβδομάδας"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
@@ -3802,23 +3813,30 @@ msgstr "Αν θα εμφανίζεται η ώρα σε 24ώρη μορφή αν
 msgid "Whether to show week numbers in date navigator"
 msgstr "Αν θα εμφανίζονται οι αριθμοί εβδομάδων στον περιηγητή ημερολογίου"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Η περίληψη περιέχει"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Η περιγραφή περιέχει"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Το σχόλιο περιέχει"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Η περιγραφή περιέχει"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Αταίριαστο"
 
 #: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
@@ -3873,7 +3891,8 @@ msgstr "%d %B"
 #: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
 #: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -3937,7 +3956,8 @@ msgstr ""
 
 #: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
-msgstr "Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
+msgstr ""
+"Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
 
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
@@ -4067,7 +4087,7 @@ msgstr "ώρες"
 msgid "minutes"
 msgstr "λεπτά"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Ενέργεια/Trigger"
 
@@ -4139,7 +4159,7 @@ msgid "hour(s)"
 msgstr "ώρα(ες)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
@@ -4200,7 +4220,7 @@ msgstr "30 λεπτά"
 msgid "60 minutes"
 msgstr "60 λεπτά"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Ειδοποιήσεις"
 
@@ -4225,7 +4245,7 @@ msgid "Days"
 msgstr "Ημέρες"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
@@ -4365,7 +4385,7 @@ msgid "_Fri"
 msgstr "_Παρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Γενικά"
 
@@ -4760,7 +4780,8 @@ msgstr "Είστε βέβαιοι για την διαγραφή της κατα
 
 #: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
+msgstr ""
+"Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
@@ -4803,7 +4824,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
@@ -4861,23 +4883,32 @@ msgstr "Δρομολόγηση"
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Η ημερομηνία λήξης είναι πριν από την ημερομηνία έναρξης!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λάθος"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Η ώρα έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Η ώρα λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Αδυναμία ανοίγματος του ημερολογίου '%s'."
@@ -4956,26 +4987,26 @@ msgstr "Χρόνος Έ_ναρξης:"
 #: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Κανένα"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Το επιλεγμένο organizer δεν έχει πια ένα λογαριασμό."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
@@ -5085,15 +5116,19 @@ msgstr "Όνομα λίστας εργασιών"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε?"
+msgstr ""
+"Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε?"
+msgstr ""
+"Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5161,7 +5196,7 @@ msgstr "στο"
 msgid "occurrences"
 msgstr "εμφανίσεις"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Ημερομηνία/Ώρα"
 
@@ -5194,7 +5229,7 @@ msgid "_No recurrence"
 msgstr "_Χωρίς επανεμφάνιση"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Α_φαίρεση"
 
@@ -5250,17 +5285,20 @@ msgstr "Η πληροφορίες της συνάντησης έχουν δημ�
 
 #: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
-msgstr "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr ""
+"Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
+msgstr ""
+"Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
-msgstr "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
+msgstr ""
+"Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
 
@@ -5344,16 +5382,16 @@ msgstr "Βασικό"
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Η ημερομηνία λήξης είναι πριν από την ημερομηνία έναρξης!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιών στο '%s'."
@@ -5364,7 +5402,7 @@ msgstr "_Εμπιστευτικό"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -5551,7 +5589,7 @@ msgstr "Ημερομηνία Έναρξης"
 msgid "Summary"
 msgstr "Περίληψη"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr " χρώμα"
 
@@ -5614,7 +5652,7 @@ msgstr "Όχι"
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Άγνωστο"
@@ -5703,7 +5741,7 @@ msgstr "_Αποκοπή"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2231 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5812,7 +5850,7 @@ msgid "Alarms"
 msgstr "Ειδοποιήσεις"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
@@ -6072,7 +6110,7 @@ msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
@@ -6254,7 +6292,8 @@ msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει �
 
 #: calendar/gui/e-itip-control.c:1544
 msgid "The attachment has no viewable calendar items"
-msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
+msgstr ""
+"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
 #: calendar/gui/e-itip-control.c:1775
 msgid "Calendar file could not be updated!\n"
@@ -6276,7 +6315,8 @@ msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν
 
 #: calendar/gui/e-itip-control.c:1833
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
+msgstr ""
+"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
 #: calendar/gui/e-itip-control.c:1845
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -6534,7 +6574,7 @@ msgstr "Ιστοσελίδα:"
 msgid "Click to open %s"
 msgstr "Κλικ για άνοιγμα %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6544,7 +6584,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6555,12 +6595,12 @@ msgstr ""
 "%s\n"
 " has crashed."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6569,19 +6609,19 @@ msgstr ""
 "Σφάλμα ανοίγματος %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Φόρτωση εργασιών"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
@@ -8717,7 +8757,8 @@ msgstr "Προετοιμασία φακέλου  '%s' για εργασία χω
 
 #: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
-msgstr "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
+msgstr ""
+"Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
@@ -8798,7 +8839,7 @@ msgstr "Μη έγκυρες παράμετροι σε  (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
@@ -8843,7 +8884,8 @@ msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτησ
 #: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
+msgstr ""
+"Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
 
 #: camel/camel-folder.c:1322
 msgid "Moving messages"
@@ -8887,7 +8929,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
@@ -8948,7 +8990,8 @@ msgstr "Αυτό το σημείο του μηνύματος είναι ψηφι
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: Εσφαλμένη μορφή μηνύματος"
+msgstr ""
+"Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: Εσφαλμένη μορφή μηνύματος"
 
 #: camel/camel-gpg-context.c:1397
 #, c-format
@@ -8987,7 +9030,8 @@ 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 "Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
+msgstr ""
+"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
 
 #: camel/camel-lock-client.c:204
 #, c-format
@@ -9002,7 +9046,8 @@ msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλ
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
+msgstr ""
+"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -9185,7 +9230,8 @@ msgstr "Μη έγκυρο challenge διακομιστή\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
+msgstr ""
+"Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9193,7 +9239,8 @@ msgstr "Στην απάντηση του διακομιστή δεν υπάρχ�
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
+msgstr ""
+"Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9255,7 +9302,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "Το παρεχόμενο χειριστήριο περιεχομένου δεν αναφέρετε σε έγκυρο περιεχόμενο."
+msgstr ""
+"Το παρεχόμενο χειριστήριο περιεχομένου δεν αναφέρετε σε έγκυρο περιεχόμενο."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9272,7 +9320,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -9291,7 +9339,8 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στο διακομιστή με την πιστοποίηση Kerberos 4."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στο διακομιστή με την πιστοποίηση Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -9308,7 +9357,8 @@ msgstr "Είσοδος"
 
 #: 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 "Με την επιλογή αυτή θα γίνει σύνδεση στο διακομιστή με χρήση ενός κωδικού."
+msgstr ""
+"Με την επιλογή αυτή θα γίνει σύνδεση στο διακομιστή με χρήση ενός κωδικού."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -9385,7 +9435,8 @@ msgstr "Αποτυχία στην αναζήτηση ονόματος: %s"
 #: camel/camel-service.c:785 camel/camel-service.c:909
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Αποτυχία στην αναζήτηση συστήματος: Αδυναμία δημιουργίας αλληλουχίας: %s"
+msgstr ""
+"Αποτυχία στην αναζήτηση συστήματος: Αδυναμία δημιουργίας αλληλουχίας: %s"
 
 #: camel/camel-service.c:798
 #, c-format
@@ -9470,7 +9521,8 @@ msgstr "Υπογράφων: %s <%s>: %s\n"
 
 #: camel/camel-store.c:212
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
 #: camel/camel-store.c:244
 #, c-format
@@ -9479,18 +9531,19 @@ msgstr "Δεν είναι δυνατή η δημιουργία φακέλου`%s
 
 #: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
 #: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
@@ -9735,7 +9788,8 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 #: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
+msgstr ""
+"Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
 
 #: camel/camel-vtrash-folder.c:44
 msgid "Cannot copy messages to the Trash folder"
@@ -9743,7 +9797,8 @@ msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων σ
 
 #: camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων στον φάκελο ανεπιθύμητης αλληλογραφίας"
+msgstr ""
+"Δεν ήταν δυνατή η αντιγραφή μηνυμάτων στον φάκελο ανεπιθύμητης αλληλογραφίας"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
@@ -9757,10 +9812,11 @@ msgstr "Έλεγχος για νέα μηνύματα σε όλους τους �
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα Εισερχόμενα σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα Εισερχόμενα σ' αυτόν τον διακομιστή"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Αυτόματος συγχρονισμός απομακρυσμένης αλληλογραφίας τοπικά"
 
@@ -9781,38 +9837,36 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Για την πρόσβαση σε εξυπηρετητές Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Με την επιλογή αύτη θα γίνει σύνδεση στο διακομιστή IMAP με χρήση κωδικού "
 "απλού κειμένου."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Προεπιλογή"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
@@ -9861,21 +9915,21 @@ msgstr "Δεν ήταν δυνατή η δημιουργία του καταλό
 msgid "Could not load summary for %s"
 msgstr "Δεν ήταν δυνατή η φόρτωση της περίληψης του  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 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:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Γίνεται σάρωση για αλλαγμένα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Αδυναμία ανάκτησης μηνύματος: %s "
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9891,25 +9945,25 @@ msgstr ""
 "Δεν μπορεί να γίνει η λήψη του μηνύματος: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την στιγμή"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Λήψη πληροφορίες περίληψης για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Αδυναμία εύρεσης σώματος μηνύματος στην απάντηση FETCH."
 
@@ -9962,29 +10016,40 @@ msgstr "Namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
+
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Διακομιστής IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Υπηρεσία IMAP για %s στο %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9993,64 +10058,66 @@ msgstr "Υπηρεσία IMAP για %s στο %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στο %s (θύρα %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με την εντολή \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
+msgstr ""
+"Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10061,13 +10128,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10075,19 +10142,20 @@ msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: `%s': ο φάκελος υπάρχει"
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
 "χαρακτήρα \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
@@ -10112,7 +10180,7 @@ msgstr ""
 "\n"
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP  στο %s "
@@ -10243,7 +10311,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου �
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:417
 #: camel/providers/local/camel-mbox-store.c:319
@@ -10333,9 +10402,9 @@ msgid "Checking for new messages"
 msgstr "Έλεγχος για νέα μηνύματα"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Φάκελος αποθήκευσης"
@@ -10438,75 +10507,76 @@ msgstr "Δεν ήταν δυνατή η μετονομασία `%s': `%s': %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του  '%s' σε %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του φακέλου: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στο φάκελο %s"
+msgstr ""
+"Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στο φάκελο %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα του αρχείου: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Δεν είναι δυνατό το άνοιγμα του προσωρινού mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του φακέλου πηγής %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Δεν ήταν δυνατό το κλείσιμο του προσωρινού φακέλου:%s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2193
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ασυμφωνία περίληψης και φακέλου, ακόμα και μετά από συγχρονισμό"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Άγνωστο σφάλμα: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Αδυναμία αποθήκευσης φακέλου : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Σφάλμα κατά την εγγραφή του προσωρινού mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Η εγγραφή του προσωρινού mailbox απέτυχε: %s: %s"
@@ -10685,7 +10755,8 @@ msgstr "Αποτυχία αποστολής κεφαλίδας συζητήσε�
 #: camel/providers/nntp/camel-nntp-folder.c:417
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Αποτυχία αποστολής στην ομάδα συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
+msgstr ""
+"Αποτυχία αποστολής στην ομάδα συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
 
 #: camel/providers/nntp/camel-nntp-folder.c:429
 msgid "Error reading response to posted message: message not posted"
@@ -10722,8 +10793,10 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Αδυναμία αποθήκευσης αρχείου λίστας ομάδας για %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Εμφάνιση φακέλων σε σύντμηση (π.χ l.g.linux αντί για local.greek.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Εμφάνιση φακέλων σε σύντμηση (π.χ l.g.linux αντί για local.greek.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -10900,7 +10973,7 @@ msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Απενεργοποίηση υποστήριξης για όλες τις επεκτάσεις  POP3 "
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10937,7 +11010,8 @@ msgstr "Δεν ήταν δυνατή η σύνδεση στο διακομιστ
 #: camel/providers/pop3/camel-pop3-store.c:268
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:366
 #, c-format
@@ -10990,7 +11064,7 @@ msgid "No such folder `%s'."
 msgstr "Δεν υπάρχει ο φάκελος `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11036,7 +11110,8 @@ msgstr "Δεν είναι δυνατό να εκτελεστεί το %s: το �
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
+msgstr ""
+"το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
@@ -11046,7 +11121,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11130,7 +11205,8 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
+msgstr ""
+"Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
 
 #: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
@@ -11168,7 +11244,8 @@ msgstr "Σφάλμα απάντησης Welcome"
 #: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
@@ -11186,7 +11263,8 @@ msgstr "Σφάλμα απάντησης STARTTLS"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
+msgstr ""
+"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11220,13 +11298,14 @@ msgstr ""
 "Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι "
 "έγκυρη."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Γίνεται αποστολή μηνύματος"
 
 #: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
 
 #: camel/providers/smtp/camel-smtp-transport.c:717
 msgid "Cannot send message: one or more invalid recipients"
@@ -11330,34 +11409,34 @@ msgstr "Αίτηση QUIT έκτος χρόνου: %s"
 msgid "QUIT response error"
 msgstr "Σφάλμα απάντησης QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "συννημένο"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Αφαίρεση επιλεγμένων αντικειμένων από τον κατάλογο συννημένων"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Προσθήκη συννημένου..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
@@ -11467,14 +11546,16 @@ msgstr "Αποστολή Σε:"
 
 #: composer/e-msg-composer-hdrs.c:614
 msgid "Click here to select folders to post to"
-msgstr "Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
+msgstr ""
+"Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
 
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Επισύναψη αρχείου(ων)"
 
 #: composer/e-msg-composer.c:652
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
 "υπογραφής από τον λογαριασμό."
@@ -11786,7 +11867,8 @@ msgstr "Απομνημόνευση του κωδικού πρόσβασης"
 
 #: e-util/e-passwords.c:359
 msgid "Remember this password for the remainder of this session"
-msgstr "Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
@@ -12007,19 +12089,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Σημαντικό"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Πρός Τακτοποίηση"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Αργότερα"
 
@@ -12123,7 +12205,7 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -12484,14 +12566,16 @@ msgid "Composer Preferences"
 msgstr "Προτιμήσεις Επεξεργαστή"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
 "ασφάλειας και της προβολής μηνυμάτων"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -12535,7 +12619,7 @@ msgstr "Μηνύματα"
 msgid "Mail Accounts"
 msgstr "Λογαριασμοί Αλληλογραφίας"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Προτιμήσεις Αλληλογραφίας"
 
@@ -12615,7 +12699,8 @@ msgstr ""
 
 #: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
-msgstr "Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
+msgstr ""
+"Αυτό το μήνυμα περιέχει μόνο παραλήπτες στο Ιδιαίτερης κοινοποίησηςBcc)."
 
 #: mail/em-composer-utils.c:162
 msgid ""
@@ -12674,7 +12759,8 @@ msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1951
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
@@ -12684,21 +12770,21 @@ msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
 msgid "Folder _name:"
 msgstr "_Όνομα φακέλου:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "ΑΤΑΙΡΙΑΣΤΑ"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Γίνεται φόρτωση..."
 
@@ -12711,86 +12797,87 @@ msgstr "Αδυναμία μετακίνησης μηνυμάτων σε ένα t
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Δεν ήταν δυνατή η μετακίνηση του φακέλου %s: Άκυρη λειτουργία"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1916
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
 #: mail/em-folder-view.c:660 mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: mail/em-folder-tree.c:1951
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Δημιουργία φακέλου"
 
-#: mail/em-folder-tree.c:2070
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου: %s"
 
-#: mail/em-folder-tree.c:2095
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Δεν ήταν δυνατή η διαγραφή του τοπικού φακέλου %s"
 
-#: mail/em-folder-tree.c:2101
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Αλήθεια να γίνει διαγραφή του φακέλου \"%s\" και όλων των υποφακέλων του?"
+msgstr ""
+"Αλήθεια να γίνει διαγραφή του φακέλου \"%s\" και όλων των υποφακέλων του?"
 
-#: mail/em-folder-tree.c:2111
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Διαγραφή \"%s\""
 
-#: mail/em-folder-tree.c:2145
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Δεν ήταν δυνατή η μετονομασία του τοπικού φακέλου %s."
 
-#: mail/em-folder-tree.c:2154
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: mail/em-folder-tree.c:2156
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: mail/em-folder-tree.c:2180
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Ένας φάκελος που ονομάζεται \"%s\" υπάρχει ήδη. Παρακαλώ χρησιμοποιείστε ένα "
 "διαφορετικό όνομα."
 
-#: mail/em-folder-tree.c:2226 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2227
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Άνοιγμα σε _Νέο παράθυρο"
 
-#: mail/em-folder-tree.c:2232
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2236
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Νέος Φάκελος..."
 
-#: mail/em-folder-tree.c:2239
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: mail/em-folder-tree.c:2242 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
@@ -12922,6 +13009,12 @@ msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 msgid "Filter on Thread"
 msgstr "Φίλτρο στην αλληλουχία"
 
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Προεπιλογή"
+
 #: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
@@ -12950,8 +13043,8 @@ msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"Αυτό το μήνυμα είναι υπογεγραμμένο. Δεν υπάρχει εγγύηση ότι το μήνυμα"
-"είναι αυθεντικό."
+"Αυτό το μήνυμα είναι υπογεγραμμένο. Δεν υπάρχει εγγύηση ότι το μήνυμαείναι "
+"αυθεντικό."
 
 #: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
@@ -13139,7 +13232,7 @@ msgid "Bcc"
 msgstr "Ιδιαίτερη Κοινοποίηση"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:739
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Πρόγραμμα αλληλογραφίας"
 
@@ -13171,15 +13264,20 @@ msgstr "Αδυναμία ανάλυσης μηνύματος S/MIME: Άγνωσ�
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησης για  multipart/encrypted"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
 
@@ -13199,22 +13297,22 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το Evolution να εισάγει τους φακέλους σας..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Αποτυχία εισαγωγής pop3 uid caches: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Αποτυχία εισαγωγής folder expand state: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Αποτυχία δημιουργίας καταλόγου `%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Αποτυχία ανοίγματος αποθηκευτικού χώρου για `%s': %s"
@@ -13342,12 +13440,18 @@ msgstr "Αποθήκευση μηνύματος..."
 msgid "Add address"
 msgstr "Προσθήκη διεύθυνσης"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Μήνυμα από τον/την %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13361,7 +13465,7 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13386,98 +13490,93 @@ msgid "Check incoming mail being junk"
 msgstr "Έλεγχος εισερχόμενης αλληλογραφία για ανεπιθύμητα μηνύματα"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr ""
-"Έλεγχος εισερχόμενης αλληλογραφία για ανεπιθύμητα μηνύματα σε λογαριασμούς "
-"IMAP"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Χρώμα επισήμανσης παραθέσεων"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Χρώμα επισήμανσης παραθέσεων."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Προεπιλεγμένο ύψος παραθύρου σύνταξης"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου σύνταξης"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στην σύνταξη μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στην σύνταξη μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στην εμφάνιση μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων στην εμφάνιση μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Προεπιλεγμένο στυλ προώθησης"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου σύνταξης"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Προεπιλεγμένο πλάτος παραθύρου μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Προεπιλεγμένο στυλ απάντησης"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου σύνταξης"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Προκαθορισμένο πλάτος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Σχεδίαση σημάνσεων ορθογραφικών σφαλμάτων καθώς πληκτρολογείτε."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Άδειασμα Φακέλων Απορριμάτων στην έξοδο "
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Άδειασμα όλων των φακέλων  Απορριμάτων κατά την έξοδο από το  Evolution."
+msgstr ""
+"Άδειασμα όλων των φακέλων  Απορριμάτων κατά την έξοδο από το  Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Ενεργοποίηση λειτουργίας caret, έτσι ώστε να βλέπετε ένα δρομέα κατά την "
 "ανάγνωση της αλληλογραφίας."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Ενεργοποίηση/απενεργοποίηση λειτουργίας caret"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Ύψος του ταμπλώ της λίστας μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Ύψος του ταμπλώ της λίστας μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13487,25 +13586,25 @@ msgstr ""
 "μέσα στο Evolution, οποιοιδήποτε τύποι mime που είναι σε αυτήν την λίστα θα "
 "χρησιμοποιούνται για εμφάνιση."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Λίστα από Ετικέτες και από τα συσχετιζόμενα χρώματα τους"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Λίστα λογαριασμών"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr "Λίστα προσαρμοσμένων κεφαλίδων και αν θα είναι ενεργοποιημένες."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13513,15 +13612,15 @@ 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:32
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Λίστα τύπων mime για έλεγχο για εφαρμογές προβολής συστατικού bonobo"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Φόρτωση εικόνων για μηνύματα HTML σε http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13532,79 +13631,81 @@ msgstr ""
 "αποστολέας είναι στο βιβλίο διευθύνσεων  2 - Να φορτώνονται πάντοτε εικόνες "
 "από το δίκτυο"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Καταγραφή ενεργειών φίλτρων"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Καταγραφή ενεργειών φίλτρων στο καθορισμένο αρχείο καταγραφής."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Προεπιλεγμένο ύψος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Προεπιλεγμένο πλάτος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
-msgstr "Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
+msgstr ""
+"Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Αρχείο ήχου ειδοποίησης Νέου Μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Τύπος ειδοποίησης νέου μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Ειδοποίηση σε κενό θέμα"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να κάνει εκκαθάριση ενός φακέλου."
 
-#: mail/evolution-mail.schemas.in.in.h:50
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς θέμα."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Ειδοποίηση όταν ο χρήστης κάνει εκκαθάριση"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Ειδοποίηση όταν ο χρήστης συμπληρώνει μόνο το πεδίο Κρυφ.Κοιν"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13612,101 +13713,96 @@ msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει HTML σε επαφές που δεν "
 "επιθυμούν αλληλογραφία σε HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς παραλήπτες "
 "στο Πρός ή στο Κοινοποίηση."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ανεπιθύμητο HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Αναγνώριση δεσμών στο κείμενο και αντικατάσταση τους."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Αναγνώριση smileys στο κείμενο και αντικατάσταση τους με εικόνες."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
-msgstr "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
 msgstr ""
-"Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία "
-"(έγκυρο μόνο αν το check_incoming έχει ορισθεί σε true)"
+"Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Εμφάνιση Κινούμενων Εικόνων"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Εμφάνιση κινούμενων εικόνων ως κινούμενα σχέδια."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στην λίστα μηνυμάτων."
+msgstr ""
+"Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στην λίστα μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Εμφάνιση διαγραμμένων μηνυμάτων στην λίστα μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Προβολή του ταμπλώ \"Προπεπισκόπηση\""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Προβολή του ταμπλώ \"Προπεπισκόπηση\"."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Αρχείο για αναπαραγωγή ήχου κατά την άφιξη νέου μηνύματος."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
+msgstr ""
+"Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Έλεγχος ορθογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Γραμματοσειρά τερματικού"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Η γραμματοσειρά τερματικού για για εμφάνιση αλληλογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Η γραμματοσειρά μεταβλητού πλάτους για εμφάνιση αλληλογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13718,99 +13814,99 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Αλληλουχία λίστας μηνυμάτων."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Αλληλουχία λίστας μηνυμάτων"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Αλληλουχία λίστας μηνυμάτων κατά Θέμα"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Λήξη χρόνου για σημείωση μηνυμάτων ως ανοιγμένα"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Λήξη χρόνου για σημείωση μηνυμάτων ως ανοιγμένα."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Αλφαριθμητικό UID του προεπιλεγμένου λογαριασμού."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Χρήση δαίμονα και πελάτη  Spamasssassin"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Χρήση δαίμονα και πελάτη Spamasssassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Χρήση προσαρμοσμένης γραμματοσειράς"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Χρήση προσαρμοσμένης γραμματοσειράς για την εμφάνιση αλληλογραφίας"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Χρήση μόνο τοπικών δοκιμών spam."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Χρήση μόνο των τοπικών δοκιμών spam (όχι DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Γραμματοσειρά μεταβλητού πλάτους"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κρυφ.Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κρυφ.Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Κοιν."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Από"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Από."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Αποστολή σε"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Αποστολή σε."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Απάντηση σε"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Είναι σημειώμενο το αντικείμενο μενού στο Προβολή/Απάντηση σε."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13818,11 +13914,11 @@ msgstr ""
 "Αν θα γίνεται επαναφορά ή όχι σε αλληλουχία θεμάτων όταν τα μηνύματα δεν "
 "περιέχουν κεφαλίδες Σε απάντηση ή Αναφορές."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "θύρα για έναρξη spamd εκτελεσμένου από χρήστη"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "θύρα spamd"
 
@@ -13859,15 +13955,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
@@ -13888,22 +13984,22 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Φάκελος προορισμού:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
 msgstr "Επιλογή ενός φακέλου για εισαγωγή σε"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Εισάγεται`%s'"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Γίνεται Εισαγωγή mailbox"
@@ -14062,15 +14158,15 @@ msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμ�
 msgid "Evolution Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Θέση:"
 
@@ -14122,29 +14218,44 @@ msgstr ""
 "    '%s'\n"
 "Και έχει ανανεωθεί."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Υπάρχουν μη απεσταλμένα μηνύματα, θέλετε να τερματίσετε την εφαρμογή "
 "οπωσδήποτε?"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Νέος ΕΦάκελος"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Φίλτρα Μηνυμάτων"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Δημιουργία νέου ημερολογίου"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "Το URI  της πηγής αλληλογραφίας που θα εμφανίσει η προβολή"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Ταυτότητα"
 
@@ -14189,7 +14300,7 @@ msgstr ""
 "μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
 "Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Διαχείριση Λογαριασμού"
 
@@ -14216,124 +14327,120 @@ msgid "Connecting to server..."
 msgstr "Σύνδεση στο διακομιστή..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Προβαλλόμενες κεφαλίδες μηνύματος</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Πληροφορίες Λογαριασμού"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Προσθήκη _Δέσμης Ενεργειών"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Προσθήκη νέας υπογραφής..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Πάντοτε _κρυφή κοινοποίηση (Bcc) σε:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την "
 "κρυπτογράφηση"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συννημένο"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Κωδικοποίηση  _Χαρακτήρων:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "Χ_ρώματα"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Έλεγχος ε_ισερχόμενης αλληλογραφίας"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Έλεγχος αλληλογραφίας κατά την πληκ_τρολόγηση"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Έλεγχος για Νέα Μηνύματα"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ελέγχει την εισερχόμενη αλληλογραφία για ανεπιθύμητη αλληλογραφία"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Χρώμα για ανορ_θόγραφες λέξεις:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Συγγραφή Μηνυμάτων"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14349,279 +14456,277 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Εφαρμογή\" για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Προκαθορισμένη Συμπεριφορά"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Προεπιλεγμένη κω_δικοποίηση χαρακτήρων:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Διαγραφή Αλληλογραφίας"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Να _υπογράφονται πάντα ψηφιακά τα μηνύματα (προεπιλογή)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "Να _μην γίνει έλεγχος εισερχόμενης αλληλογραφίας για λογαριασμούς IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Να μην γίνεται παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
+msgstr ""
+"Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Φάκελος προχείρων:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Λογαριασμοί Email"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Διεύ_θυνση Email:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Πιστοποιητικό κρ_υπτογράφησης:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Βοηθός Λογαριασμού Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Εκτέλεση Εντολής..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Στα_θερού πλάτους:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Επιλογές Φίλτρων"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Ιδιότητες Γραμματοσειράς"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Μορφοποίηση μηνυμάτων σε _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Κε_φαλίδες"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Επισήμανση παρα_θέσεων με"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Μέσα στο μήνυμα"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Ετικέτες και Χρώματα"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Φόρτωση Εικόνων"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Ρυθμίσεις Ταχυδρομείου"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Θέση Mailbox"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Επεξεργαστής Μηνύματος"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Προβολή Μηνύματος"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Γραμματοσειρές Μηνυμάτων"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Ειδοποίηση Νέου Μηνύματος"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
+msgstr ""
+"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Προαιρετικές Πληροφορίες"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Ορ_γανισμός:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Διαλέξτε χρώμα"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
 "κρυφή _κοινοποίηση (Bcc)"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Εκτυπωμένες Γραμματοσειρές"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Με παράθεση"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού πρόσβασης"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Α_πάντηση Σε:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Γίνεται Λήψη Μηνύματος"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Επιλ_ογές Λήψης"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Απομνημόνευση του κωδικού _πρόσβασης"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Απαιτούμενες Πληροφορίες"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Επαναφορά Προεπιλογών"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Ασφάλ_εια"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Ασφαλές MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους "
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Αποστέλλονται τα μηνύματα"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Φάκελος _απεσταλμένων μηνυμάτων:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ο _διακομιστής απαιτεί πιστοποίηση"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Ρυθμίσεις Διακομιστή"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Είδος _Διακομιστή: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Πιστοποίητικό υπογρα_φής:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Ορισμός όνοματος αρ_χείου:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Έλεγχος Ορ_θογραφίας"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14631,7 +14736,7 @@ msgstr ""
 "η υπογραφή σας. Το όνομα που θα καθορίσετε θα χρησιμοποιηθεί\n"
 "μόνο για την εμφάνιση."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14641,7 +14746,7 @@ msgstr ""
 "ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
 "γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14649,15 +14754,15 @@ msgstr ""
 "Πληκτρολογήστε το όνομα με το οποίο θα αναφέρεστε για τον λογαριασμό.\n"
 "Για παράδειγμα: \"Work\" or \"Personal\" "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Χρήση _Δαίμονα"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Μετ_αβλητού πλάτους:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14667,171 +14772,171 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Επόμενο\" για να ξεκινήσετε.. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Προσθήκη υπογραφής"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Να γίνεται _πάντα φόρτωμα των εικόνων από το δικτύου"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Να _υπογράφονται πάντα τα μηνύματα στη χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Τύπος _Πιστοποίησης: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Τύπος _Πιστοποίησης: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα κάθε"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Ήχος κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Επι_βεβαίωση στην εξάλειψη από ένα φάκελο"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Προεπιλεγμένη  Υπογραφή:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Προεπιλογή"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Κρυπτογράφηση εξερχόμενης αλληλογραφίας (προεπιλογή)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr " Στυλ προώ_θησης:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "Π_λήρες Όνομα:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Αλληλογραφία _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "Τα_υτότητα"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "Ανεπι_θύμητη αλληλογραφία"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Φόρτωση εικόνων αν ο αποστολέας υπάρχει στο βιβλίο διευθύνσεων"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "_Τοπικές δοκιμές μόνο"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Αυτός είναι ο _προεπιλεγμένος λογαριασμός"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Να μην φορτώνονται ποτέ εικόνες από το δίκτυο"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Ερώ_τηση στην αποστολή μηνυμάτων HTML σε επαφές που δεν το θέλουν"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ε_ρώτηση στην αποστολή μηνυμάτων με άδειο θέμα"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Λήψη Μηνυμάτων"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Στυλ α_πάντησης:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Επαναφορά προεπιλογών"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Δέσμη ενεργειών:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "Επιλο_γή..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Απο_στολή Αλληλογραφίας"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Εμφάνι_ση κινούμενων εικόνων"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Υπογραφές"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Κανονική γραμματοσειρά:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Γραμματοσειρά _Τερματικού:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Χρήση των ίδιων γραμματοσειρών με τις άλλες εφαρμογές"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "Περιγραφή"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -14866,12 +14971,12 @@ msgstr "Φιλτράρισμα Φακέλου"
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Αποτυχία εφαρμογής εξερχόμενων φίλτρων:  %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14880,116 +14985,116 @@ msgstr ""
 "Αποτυχία προσθήκης στο %s: %s\n"
 "Γίνεται προσθήκη στο φάκελο 'Απεσταλμένα'."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Αποτυχία προσθήκης στον φάκελο 'Απεσταλμένα': %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Αποστέλλεται \"%s\""
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στο φάκελο"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Αποθηκεύεται ο λογαριασμός '%s'"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Άδειασμα κάδου σε '%s'"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Τοπικοί Φάκελοι"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14998,7 +15103,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15007,11 +15112,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15020,22 +15125,22 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου αποτελέσματος: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Αλλαγή κατάστασης ανεπιθύμητης αλληλογραφίας"
 
@@ -15067,38 +15172,38 @@ msgstr "Κρυπτοφράφηση"
 msgid "Security Information"
 msgstr "Πληροφορίες ασφάλειας"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Διακομιστής: %s, Είδος: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Θέση: %s, Τύπος: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Αποστολή & Λήψη Μηνυμάτων"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Ακύρωση _Όλων"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Ανανέωση..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
@@ -15121,7 +15226,8 @@ msgstr "_Απομνημόνευση αυτού του κωδικού"
 
 #: mail/mail-session.c:295
 msgid "_Remember this password for the remainder of this session"
-msgstr "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: mail/mail-signature-editor.c:80
 #, c-format
@@ -15436,7 +15542,8 @@ msgstr "'Εκδοση ρυθμίσεων του Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
+msgstr ""
+"ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
@@ -15455,7 +15562,8 @@ msgstr ""
 "ανάπτυξη εκδόσεις του Evolution."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-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 ""
 "Λίστα από διαδρομέα για τους φακέλους που θα συγχρονίζονται στον δίσκο για "
 "εργασία χωρίς σύνδεση"
@@ -15803,7 +15911,8 @@ msgid "Work Offline"
 msgstr "Εργασία Εκτός Δικτύου"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
 "να αποσυνδεθείτε."
@@ -15813,7 +15922,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Το Ximian Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
 "συνδεθείτε."
@@ -16055,7 +16165,8 @@ msgstr "Να μην ξαναγίνει η ερώτηση"
 
 #: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
-msgstr "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
+msgstr ""
+"Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
 #. Preview/Alpha/Beta version warning message
 #: shell/main.c:217
@@ -16112,7 +16223,8 @@ msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλ
 #: shell/main.c:390
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
+msgstr ""
+"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
 
 #: shell/main.c:487
 msgid "Start Evolution activating the specified component"
@@ -16136,7 +16248,8 @@ msgstr "Βιαία επαναεισαγωγή από το Evolution 1.4"
 
 #: shell/main.c:501
 msgid "Send the debugging output of all components to a file."
-msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr ""
+"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
 #: shell/main.c:524
 msgid "Evolution"
@@ -16237,7 +16350,8 @@ msgstr "<b>Εκδόθηκε Σε</b>"
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί  για τις ακόλουθες χρήσεις</b>"
+msgstr ""
+"<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί  για τις ακόλουθες χρήσεις</b>"
 
 #: smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -16365,14 +16479,16 @@ 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
 msgid "You have certificates on file that identify these people:"
-msgstr "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
+msgstr ""
+"Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
 
 #: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -17039,7 +17155,8 @@ msgstr "Άνοιγμα παραθύρου για την σύνθεση νέου
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr ""
+"Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -17059,7 +17176,8 @@ msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
+msgstr ""
+"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
@@ -17098,7 +17216,8 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: 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 ""
 "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
 "γραμμή στη μέση"
@@ -17117,7 +17236,8 @@ msgstr "Επικόλληση μηνύματος από το πρόχειρο"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
+msgstr ""
+"Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -17213,11 +17333,13 @@ msgstr "Δημιουργία κανόνα για το φιλτράρισμα μ�
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
@@ -17611,7 +17733,8 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr ""
+"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
@@ -18319,6 +18442,25 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr ""
+#~ "Έλεγχος εισερχόμενης αλληλογραφία για ανεπιθύμητα μηνύματα σε "
+#~ "λογαριασμούς IMAP"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία "
+#~ "(έγκυρο μόνο αν το check_incoming έχει ορισθεί σε true)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr ""
+#~ "Να _μην γίνει έλεγχος εισερχόμενης αλληλογραφίας για λογαριασμούς IMAP"
+
 #~ msgid "No data provided"
 #~ msgstr "Δεν έχουν δοθεί δεδομένα"
 
@@ -18611,4 +18753,3 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
 #~ msgid "Evolution is now exiting ..."
 #~ msgstr "Το Evolution τώρα τερματίζεται..."
-
diff --git a/po/en_AU.po b/po/en_AU.po
index 4df606beec..cda37fc427 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -46,8 +46,7 @@ msgstr ""
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr ""
 
@@ -90,20 +89,20 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -111,71 +110,71 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 #, fuzzy
 msgid "_Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr ""
 
@@ -188,39 +187,41 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -228,7 +229,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -236,65 +237,69 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Could not close temporary folder: %s"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+msgid "The URI that the address book will display"
+msgstr ""
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -338,7 +343,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -370,20 +375,22 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
-msgstr ""
+#, fuzzy
+msgid "Address Book Creation Assistant"
+msgstr "Organisation"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Cannot initialise Evolution's mail component."
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr ""
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Cannot initialise Evolution's mail component."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr ""
 
@@ -393,56 +400,57 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -452,30 +460,30 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -486,7 +494,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -495,7 +503,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -503,38 +511,39 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -543,7 +552,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -551,7 +560,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -561,50 +570,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -612,28 +622,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -641,19 +651,19 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -662,39 +672,39 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr ""
 
@@ -815,7 +825,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr ""
 
@@ -904,10 +914,10 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -955,16 +965,16 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "Chile"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1949,69 +1959,77 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Can not open message"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Organisation"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr ""
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2019,88 +2037,92 @@ msgstr ""
 msgid "Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+msgid "GroupWise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr ""
 
@@ -2258,11 +2280,11 @@ msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2349,13 +2371,13 @@ msgid "Email begins with"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
@@ -2372,101 +2394,101 @@ msgid "Type"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
-msgstr ""
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2475,8 +2497,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
 
@@ -2519,7 +2541,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr ""
 
@@ -2580,7 +2602,7 @@ msgid "Nickname"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr ""
 
@@ -2589,7 +2611,7 @@ msgid "Office"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2707,63 +2729,68 @@ msgstr ""
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Chile"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr ""
 
@@ -2772,8 +2799,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2803,7 +2830,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2823,8 +2850,9 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
-msgstr ""
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Cannot initialise Evolution's mail component."
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -2958,8 +2986,9 @@ msgid "Add address to existing contact \"%s\""
 msgstr ""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Cannot initialise Evolution's mail component."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -3014,18 +3043,41 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "_Other Organiser"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "_Other Organiser"
@@ -3118,7 +3170,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr ""
 
@@ -3296,8 +3348,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr ""
 
@@ -3380,10 +3432,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr ""
 
@@ -3428,26 +3479,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3456,12 +3505,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3469,7 +3518,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3480,19 +3529,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3630,24 +3679,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Organisation"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr ""
 
@@ -3674,7 +3729,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
 
@@ -3696,74 +3751,74 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "Synchronising folders"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3895,7 +3950,7 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -3967,7 +4022,7 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr ""
 
@@ -3978,7 +4033,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr ""
 
@@ -4028,7 +4083,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4053,7 +4108,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr ""
 
@@ -4195,7 +4250,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr ""
 
@@ -4286,7 +4341,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "_Other Organiser"
@@ -4433,23 +4488,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4486,8 +4541,8 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr ""
 
@@ -4515,10 +4570,21 @@ msgstr "Could not initialise Bonobo"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, c-format
+msgid "Select destination %s"
 msgstr ""
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "_Other Organiser"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4621,7 +4687,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr ""
 
@@ -4645,23 +4711,31 @@ msgstr ""
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Could not close temporary folder: %s"
@@ -4739,29 +4813,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4949,7 +5023,7 @@ msgstr ""
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr ""
 
@@ -4982,7 +5056,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr ""
 
@@ -5021,7 +5095,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5045,7 +5119,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5058,7 +5132,7 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr ""
 
@@ -5071,7 +5145,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr ""
 
@@ -5090,7 +5164,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr ""
 
@@ -5130,16 +5204,16 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5150,7 +5224,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr ""
 
@@ -5336,11 +5410,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr "Colours"
@@ -5366,7 +5439,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr ""
 
@@ -5398,10 +5471,10 @@ msgstr ""
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr ""
@@ -5414,99 +5487,105 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
@@ -5593,7 +5672,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr ""
 
@@ -5648,26 +5727,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr ""
@@ -5848,7 +5927,7 @@ msgid "Send Latest Information"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
@@ -6304,12 +6383,12 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6317,7 +6396,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6325,40 +6404,50 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1763
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Synchronising folders"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6476,16 +6565,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6493,7 +6582,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6501,12 +6590,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6695,49 +6784,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr ""
 
@@ -6746,39 +6835,39 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6833,25 +6922,25 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -8508,7 +8597,7 @@ msgstr "Can not open message"
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
@@ -8593,7 +8682,7 @@ msgstr "Can not open message"
 msgid "Filtering new message(s)"
 msgstr "Can not open message"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8601,46 +8690,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8648,59 +8733,59 @@ msgid ""
 "%s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr ""
@@ -8813,21 +8898,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr ""
@@ -8966,7 +9064,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9097,20 +9195,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9171,21 +9256,25 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr ""
@@ -9395,21 +9484,31 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9425,15 +9524,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr ""
@@ -9452,68 +9546,65 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+msgid "Checklist"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9528,7 +9619,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9537,14 +9628,14 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9560,25 +9651,25 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9634,27 +9725,35 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9663,64 +9762,64 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9728,24 +9827,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9766,7 +9873,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Could not close temporary folder: %s"
@@ -9844,8 +9951,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9857,55 +9964,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9923,49 +10030,44 @@ msgstr "Can not append message to maildir folder: %s: %s"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
+msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
+msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -9987,9 +10089,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Synchronising folder"
@@ -10033,149 +10135,133 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr "Could not close temporary folder: %s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Can not create folder lock on %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
@@ -10189,10 +10275,15 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Can not get folder: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10214,6 +10305,25 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10440,46 +10550,46 @@ msgstr "Can not create folder lock on %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10526,7 +10636,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -10606,7 +10716,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -10658,7 +10768,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr ""
 
@@ -10821,7 +10931,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -10928,34 +11038,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11069,83 +11179,83 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11153,49 +11263,49 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11203,13 +11313,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11548,7 +11658,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr ""
@@ -11561,19 +11671,19 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr ""
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11655,7 +11765,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11671,7 +11781,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr ""
 
@@ -11841,7 +11951,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -11947,9 +12057,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
 
@@ -11957,25 +12068,25 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -12015,15 +12126,15 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr ""
 
@@ -12077,9 +12188,9 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr ""
 
@@ -12087,7 +12198,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12125,15 +12236,15 @@ msgstr ""
 msgid "[script]"
 msgstr ""
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12207,7 +12318,6 @@ msgid "Unread messages"
 msgstr "Can not open message"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12215,382 +12325,398 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Can not delete folder: %s: No such folder"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Can not rename folder: %s: No such folder"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Synchronising folders"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr ""
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
@@ -12634,29 +12760,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Can not open message"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -12670,8 +12801,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 ""
 
@@ -12688,19 +12819,23 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+msgid "Error verifying signature"
+msgstr ""
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12712,57 +12847,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12807,17 +12942,17 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12826,38 +12961,44 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Can not open message"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Chile"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, c-format
+msgid "Messages from %s"
+msgstr ""
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12866,7 +13007,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -12887,293 +13028,299 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
-msgid "Default forward style"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:12
-msgid "Default height of the Message Window"
+msgid "Default forward style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:13
-msgid "Default reply style"
+msgid "Default height of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:14
-msgid "Default width of the Message Window"
+msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Enable/disable caret mode"
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Height of the message-list pane"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Height of the message-list pane."
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13181,184 +13328,207 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
+#: 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/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/importers/elm-importer.c:244
+msgid "Importing Elm data"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr ""
-
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Synchronising folder"
+
+#: mail/importers/evolution-mbox-importer.c:119
+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
+#, c-format
+msgid "Importing `%s'"
+msgstr ""
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Organisation"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13373,7 +13543,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13381,7 +13551,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13390,48 +13560,47 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-#, fuzzy
-msgid "Scanning mail filters"
-msgstr "Synchronising folders"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
+#: mail/importers/netscape-importer.c:1677
+msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+msgid "Importing Pine data"
+msgstr ""
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr ""
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr ""
 
@@ -13471,19 +13640,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -13532,30 +13701,45 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Synchronising folders"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Synchronising folder"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Synchronising folder"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13590,7 +13774,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -13612,120 +13796,116 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "C_lose"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13735,480 +13915,476 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14227,7 +14403,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr ""
 
@@ -14239,168 +14415,168 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14432,38 +14608,38 @@ msgstr ""
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr ""
 
@@ -14563,20 +14739,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr ""
 
@@ -14898,91 +15074,18 @@ msgstr "Synchronising folders"
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Synchronising folder failed: %s: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr "Can not get folder: %s: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Synchronising folder"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Synchronising folder"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr "Can not get folder: %s: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
@@ -15106,7 +15209,7 @@ msgstr "Could not close temporary folder: %s"
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15145,6 +15248,10 @@ msgstr "Could not close temporary folder: %s"
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15250,123 +15357,6 @@ msgstr ""
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -15378,11 +15368,6 @@ msgstr "Chile"
 msgid "New"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15637,55 +15622,55 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "C_lose"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Chile"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr ""
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15746,7 +15731,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "Could not close temporary folder: %s"
@@ -15815,11 +15800,11 @@ msgstr "Organisation"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -15865,216 +15850,216 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr ""
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Chile"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "Could not close temporary folder: %s"
@@ -16666,16 +16651,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "Cannot initialise Evolution's mail component."
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Cannot initialise Evolution's mail component."
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17120,10 +17107,6 @@ msgstr ""
 msgid "HT_ML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr ""
@@ -17484,22 +17467,6 @@ msgstr ""
 msgid "_Window"
 msgstr ""
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr ""
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17561,8 +17528,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr ""
 
@@ -17801,23 +17768,23 @@ msgstr ""
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr ""
 
@@ -17832,6 +17799,34 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "Synchronising folders"
+
+#, fuzzy
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Synchronising folder failed: %s: %s"
+
+#, fuzzy
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Can not get folder: %s: %s"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr "Can not get folder: %s: %s"
+
+#, fuzzy
 #~ msgid "Work Address"
 #~ msgstr "Chile"
 
@@ -17918,18 +17913,6 @@ msgstr ""
 #~ msgstr "Organisation"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer factory"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Adding contact to LDAP server..."
 #~ msgstr "Could not close temporary folder: %s"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index fc8d8d27a3..61294390db 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,15 +7,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-23 03:15+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-23 09:43-0500\n"
 "Last-Translator: Adam Weinberger <adamw@FreeBSD.org>\n"
 "Language-Team: English/Canada <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"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -47,10 +47,9 @@ msgstr "Configure autocomple here"
 #. 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:362
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -90,19 +89,19 @@ msgstr "Evolution folder settings configuration control"
 msgid "Manager your S/Mime certificates here"
 msgstr "Manager your S/Mime certificates here"
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, 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-component.c:270
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -110,65 +109,65 @@ msgstr "New Address Book"
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Properties..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "New Contact"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "New Contact List"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Failed to connect to LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Failed to authenticate with LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Could not perform query on Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "The server responded with no supported search bases"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "This server does not support LDAPv3 schema information"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Error retrieving schema information"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Server did not respond with valid schema information"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migrating..."
 
@@ -185,26 +184,24 @@ msgstr ""
 "Please be patient while Evolution migrates your folders..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, 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:409
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personal"
 
@@ -361,7 +358,7 @@ msgstr "  S_how Supported Bases "
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -405,7 +402,7 @@ msgid "Address Book Sources"
 msgstr "Address Book Sources"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Always"
 
@@ -465,7 +462,7 @@ msgid "Group:"
 msgstr "Group:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Never"
 
@@ -723,7 +720,7 @@ msgid "Using email address"
 msgstr "Using email address"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
@@ -751,7 +748,7 @@ msgstr "_Download limit:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -907,7 +904,7 @@ msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -1001,10 +998,10 @@ msgstr "_Categories..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2194
-#: mail/em-folder-view.c:773 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1052,15 +1049,15 @@ msgid "_Web page address:"
 msgstr "_Web page address:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2044,102 +2041,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2852
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Service"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Location"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Username"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2542
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Home"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Work"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2543
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Account Name"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1461
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1469
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1692
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Save Contact as VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2147,7 +2153,7 @@ msgstr ""
 "Are you sure you want\n"
 "to delete these contacts?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2155,46 +2161,51 @@ msgstr ""
 "Are you sure you want\n"
 "to delete this contact?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2541
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Business"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2851
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2853
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2854
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3142
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Full Name:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
@@ -2443,13 +2454,13 @@ msgid "Email begins with"
 msgstr "Email begins with"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -2470,94 +2481,93 @@ msgstr "Type"
 msgid "Address Book"
 msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Save as VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "New Contact List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Go to Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Search for Contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Address Book Sources..."
 msgstr "Address Book Sources..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot Settings..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Print Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Copy to Address Book..."
 msgstr "Copy to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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 "Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
 #: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Current View"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2569,8 +2579,8 @@ 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:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Any Category"
 
@@ -2613,7 +2623,7 @@ msgid "Company Phone"
 msgstr "Company Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2672,7 +2682,7 @@ msgid "Nickname"
 msgstr "Nickname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Note"
 
@@ -2681,7 +2691,7 @@ msgid "Office"
 msgstr "Office"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organization"
 
@@ -2807,61 +2817,67 @@ msgstr "Selected"
 msgid "Has Cursor"
 msgstr "Has Cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Group"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Home page"
 
@@ -2870,8 +2886,8 @@ msgid "Success"
 msgstr "Success"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3096,17 +3112,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"
 
@@ -3135,12 +3151,12 @@ msgstr "VCard (.vcf, .gcrd)"
 msgid "Print envelope"
 msgstr "Print envelope"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Print contacts"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Print contact"
 
@@ -3232,7 +3248,7 @@ msgstr "Margins"
 msgid "Number of columns:"
 msgstr "Number of columns:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Options"
 
@@ -3410,8 +3426,8 @@ msgstr "No filename provided."
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Enter password"
 
@@ -3488,7 +3504,7 @@ 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:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3746,23 +3762,30 @@ msgstr "Whether to show times in 24h format instead of using am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Description contains"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -3791,12 +3814,8 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3818,70 +3837,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "C_alendar"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, 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:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
@@ -4013,7 +4032,7 @@ msgstr "hours"
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -4085,7 +4104,7 @@ msgid "hour(s)"
 msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4096,7 +4115,7 @@ msgstr "start of appointment"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4146,7 +4165,7 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alerts"
 
@@ -4171,7 +4190,7 @@ msgid "Days"
 msgstr "Days"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "E_nable"
 
@@ -4311,7 +4330,7 @@ msgid "_Fri"
 msgstr "_Fri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_General"
 
@@ -4628,7 +4647,7 @@ msgid "No summary"
 msgstr "No summary"
 
 #: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1144
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -4793,23 +4812,32 @@ msgstr "Scheduling"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Due date is before start date!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
@@ -4883,36 +4911,31 @@ 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:591 composer/e-msg-composer.c:2082
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:782
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "None"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "The organizer selected no longer has an account."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "An organizer is required."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegate To..."
 
@@ -5098,7 +5121,7 @@ msgstr "on the"
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -5131,7 +5154,7 @@ msgid "_No recurrence"
 msgstr "_No recurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -5173,7 +5196,7 @@ msgstr ""
 "\n"
 "Do you wish to save your changes?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1561
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
@@ -5197,7 +5220,7 @@ msgstr "The task assignment information has been created. Send it?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "The task information has changed. Send an updated version?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
@@ -5281,16 +5304,16 @@ msgstr "Basic"
 msgid "Assignment"
 msgstr "Assignment"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Due date is before start date!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
@@ -5301,7 +5324,7 @@ msgstr "Con_fidential"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Description:"
 
@@ -5488,7 +5511,7 @@ msgstr "Start Date"
 msgid "Summary"
 msgstr "Summary"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "colour"
 
@@ -5548,10 +5571,10 @@ msgstr "No"
 #: 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:1673 camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Unknown"
@@ -5593,7 +5616,7 @@ msgstr "New Task"
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Print..."
 
@@ -5620,13 +5643,13 @@ msgstr "_Publish Free/Busy Information"
 
 #: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
 #: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:748 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
 #: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:750 mail/em-popup.c:689 mail/em-popup.c:804
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Save As..."
@@ -5640,7 +5663,7 @@ msgstr "C_ut"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2187 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5749,7 +5772,7 @@ msgid "Alarms"
 msgstr "Alarms"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Complete"
 
@@ -5778,20 +5801,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5815,33 +5830,26 @@ msgstr "%02i minute divisions"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6024,7 +6032,7 @@ msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
@@ -6386,10 +6394,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-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
@@ -6398,10 +6402,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:1606
 msgid "%m/%d/%Y"
@@ -6485,12 +6485,12 @@ msgstr "Priority:"
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2180
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6500,7 +6500,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1949
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6511,12 +6511,12 @@ msgstr ""
 "%s\n"
 " has crashed."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6525,38 +6525,38 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1763
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1808
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:1957
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6567,7 +6567,7 @@ msgstr ""
 "%s\n"
 " has crashed."
 
-#: calendar/gui/gnome-cal.c:2812
+#: calendar/gui/gnome-cal.c:2799
 msgid "Purging"
 msgstr "Purging"
 
@@ -6677,16 +6677,16 @@ msgstr "Free/Busy information (%s to %s)"
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6698,7 +6698,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6710,12 +6710,12 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "On The Web"
 
@@ -8723,7 +8723,7 @@ msgstr "Cannot open message"
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
@@ -8836,9 +8836,9 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1271
-#: camel/camel-gpg-context.c:1430 camel/camel-gpg-context.c:1516
-#: camel/camel-gpg-context.c:1623 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Cancelled."
 
@@ -8851,15 +8851,11 @@ msgstr "Failed to unlock secret key: 3 bad passphrases given."
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/camel-gpg-context.c:815
-msgid "No data provided"
-msgstr "No data provided"
-
-#: camel/camel-gpg-context.c:855
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: camel/camel-gpg-context.c:1132
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8870,58 +8866,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1137
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1250 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1264 camel/camel-gpg-context.c:1672
-#: camel/camel-gpg-context.c:1723
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1422
-#: camel/camel-gpg-context.c:1509 camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1616 camel/camel-gpg-context.c:1640
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1745
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1389 camel/camel-gpg-context.c:1398
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1405
+#: camel/camel-gpg-context.c:1397
 #, 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:1492
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1647 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1651
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
@@ -9218,7 +9214,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9431,11 +9427,11 @@ msgstr "Cannot create folder: Invalid operation on this store"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Junk"
@@ -9682,6 +9678,16 @@ msgstr "Cannot rename folder: %s: Invalid operation"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "You cannot copy messages from a NNTP folder!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "You cannot copy messages from a NNTP folder!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9697,7 +9703,7 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Apply filters to new messages in Inbox on this server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatically synchronize remote mail locally"
 
@@ -9718,43 +9724,41 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Password"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "This option will connect to the IMAP server using a plaintext password."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1579 mail/em-folder-view.c:1617
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Default"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "list"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2876
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2879
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9763,26 +9767,26 @@ msgstr ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unexpected response from IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP command failed: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Server response ended too soon."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP server response did not contain %s information"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unexpected OK response from IMAP server: %s"
@@ -9797,7 +9801,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder was destroyed and recreated on server."
 
@@ -9806,12 +9810,12 @@ msgstr "Folder was destroyed and recreated on server."
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9827,25 +9831,25 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -9900,27 +9904,37 @@ msgstr "Namespace"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Apply filters to new messages in INBOX on this server"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Check for new messages in all folders"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Check for new messages in all folders"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9929,64 +9943,64 @@ msgstr "IMAP service for %s on %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9997,13 +10011,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10011,19 +10025,19 @@ msgstr "No such folder %s"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
@@ -10048,7 +10062,7 @@ msgstr ""
 "\n"
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Could not connect to POP server on %s"
@@ -10246,7 +10260,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:382
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10268,9 +10282,9 @@ msgid "Checking for new messages"
 msgstr "Checking for new messages"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Storing folder"
@@ -10373,75 +10387,75 @@ msgstr "Could not rename `%s': `%s': %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not rename '%s' to %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Could not open folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal mail parser error near position %ld in folder %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Cannot check folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Could not open file: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Cannot open temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Could not close source folder %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temp folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2149
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Could not rename folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summary and folder mismatch, even after a sync"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unknown error: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not store folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temp mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to tmp mailbox failed: %s: %s"
@@ -10828,7 +10842,7 @@ msgstr "Delete after %s day(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Disable support for all POP3 extensions"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10917,7 +10931,7 @@ msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10971,7 +10985,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11137,7 +11151,7 @@ msgstr "SMTP mail delivery via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Sending message"
 
@@ -11243,34 +11257,34 @@ msgstr "QUIT request timed out: %s"
 msgid "QUIT response error"
 msgstr "QUIT response error"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "attachment"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Remove selected items from the attachment list"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Add attachment..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Attach a file to the message"
 
@@ -11409,30 +11423,30 @@ msgstr ""
 "Error while reading file %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "File exists, overwrite?"
 
-#: composer/e-msg-composer.c:1170 composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error saving file: %s"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error loading file: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accessing file: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11441,7 +11455,7 @@ msgstr ""
 "Unable to seek on file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11450,7 +11464,7 @@ msgstr ""
 "Unable to truncate file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11459,7 +11473,7 @@ msgstr ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11468,7 +11482,7 @@ msgstr ""
 "Error autosaving message: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1392
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11476,7 +11490,7 @@ msgstr ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11487,43 +11501,43 @@ msgstr ""
 "\n"
 "Do you wish to save your changes?"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Warning: Modified Message"
 
-#: composer/e-msg-composer.c:1598
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Open file"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signature:"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2261
+#: composer/e-msg-composer.c:2263
 #, 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:2290
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2293 composer/e-msg-composer.c:3169
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2310 composer/e-msg-composer.c:3051
-#: composer/e-msg-composer.c:3052
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Compose a message"
 
-#: composer/e-msg-composer.c:3081
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11531,7 +11545,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 
-#: composer/e-msg-composer.c:3110
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11543,7 +11557,7 @@ msgstr ""
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 
-#: composer/e-msg-composer.c:3214
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11551,7 +11565,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 
-#: composer/e-msg-composer.c:4235
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11709,16 +11723,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"
@@ -11770,31 +11780,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -11930,19 +11932,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Important"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Later"
 
@@ -12046,7 +12048,7 @@ msgstr "ago"
 msgid "months"
 msgstr "months"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "seconds"
 
@@ -12215,7 +12217,7 @@ msgstr "is not Flagged"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:781
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12321,9 +12323,10 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1079
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subject"
 
@@ -12457,7 +12460,7 @@ msgstr "Mail"
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
@@ -12495,15 +12498,15 @@ msgstr "You must specify a valid script name."
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:900
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Add script signature"
 
-#: mail/em-composer-prefs.c:920
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
@@ -12594,276 +12597,283 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1907
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Loading..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:1754
+#: mail/em-folder-tree.c:1798
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Cannot move folder `%s': illegal operation"
 
-#: mail/em-folder-tree.c:1783 mail/em-folder-tree.c:1872
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1799 mail/em-folder-tree.c:1812
-#: mail/em-folder-view.c:658 mail/em-folder-view.c:672
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:1907
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2026
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Could not delete folder: %s"
 
-#: mail/em-folder-tree.c:2051
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Cannot delete local %s folder."
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Really delete folder \"%s\" and all of its subfolders?"
 
-#: mail/em-folder-tree.c:2067
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Delete \"%s\""
 
-#: mail/em-folder-tree.c:2101
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Cannot rename local %s folder."
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2112
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2136
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "A folder named \"%s\" already exists. Please use a different name."
 
-#: mail/em-folder-tree.c:2182 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2183
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2188
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Move"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2192
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2195
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2198 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:749 mail/em-popup.c:688
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:751
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:754 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:808
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:809
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:811
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:770 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:774
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:777
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:778 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "VFolder on Thread"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filter on Thread"
 
-#: mail/em-folder-view.c:1653
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Default"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:1913
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2175
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12871,11 +12881,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12883,11 +12893,11 @@ 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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12895,11 +12905,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12907,11 +12917,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12919,11 +12929,11 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12933,11 +12943,11 @@ 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12945,11 +12955,11 @@ 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12959,31 +12969,31 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:974
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:982
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:985
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1056
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Hide"
 
@@ -13030,29 +13040,34 @@ msgstr "Pointer to unknown external data (\"%s\" type)"
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "From"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Mailer"
 
@@ -13066,8 +13081,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13084,15 +13099,20 @@ msgstr "Could not parse S/MIME message: Unknown error"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
@@ -13112,22 +13132,22 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Failed to migrate pop3 uid caches: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Failed to migrate folder expand state: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Failed to create directory `%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Failed to open store for `%s': %s"
@@ -13253,12 +13273,18 @@ msgstr "Save Message..."
 msgid "Add address"
 msgstr "Add address"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mail from %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Could not create temporary directory: %s"
 
-#: mail/em-utils.c:2406
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13271,7 +13297,7 @@ msgstr ""
 "\n"
 "Really erase these messages?"
 
-#: mail/em-utils.c:2432
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13296,94 +13322,90 @@ msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Check incoming mail being junk for IMAP accounts"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Citation highlight colour"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Citation highlight colour."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Composer Window default height"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Composer Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Default height of the Composer Window"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Default height of the Message Window"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Default width of the Composer Window"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Default width of the Message Window"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Empty Trash folders on exit"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Trash folders when exiting Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13393,15 +13415,15 @@ msgstr ""
 "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."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "List of Labels and their associated colours"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13409,11 +13431,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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 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:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13421,15 +13443,15 @@ 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:32
+#: mail/evolution-mail.schemas.in.in.h:31
 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:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13439,81 +13461,81 @@ 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 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:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Message Window default hight"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Message-display style (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "New Mail Notify sound file"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "New Mail Notify type"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 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:50
+#: mail/evolution-mail.schemas.in.in.h:49
 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:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13521,99 +13543,91 @@ 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:54
+#: mail/evolution-mail.schemas.in.in.h:53
 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:55
+#: mail/evolution-mail.schemas.in.in.h:54
 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:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 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:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Run junk test on incoming mail"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Show the \"Preview\" pane"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Show the \"Preview\" pane."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Sound file to play when new mail arrives."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Specifies the type of New Mail Notification the user wishes to use."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "The terminal font for mail display"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "The variable width font for mail display"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13625,99 +13639,99 @@ msgstr ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Timeout for marking message as Seen"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Timeout for marking message as Seen."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Use Spamasssassin daemon and client"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Use Spamasssassin daemon and client (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Use custom fonts for displaying mail"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "View/Bcc menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "View/Cc menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "View/Cc menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "View/From menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "View/From menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "View/PostTo menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "View/PostTo menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "View/ReplyTo menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13725,11 +13739,11 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "port for starting user runned spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "spamd port"
 
@@ -13766,15 +13780,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is importing your old Elm mail"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importing..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
@@ -13795,22 +13809,22 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
@@ -13964,19 +13978,19 @@ msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution Account Editor"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Path:"
 
@@ -14028,27 +14042,42 @@ msgstr ""
 "    '%s'\n"
 "And have been updated."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "New VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Mail Filters"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Create a new calendar"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI of the mail source that the view will display"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identity"
 
@@ -14090,7 +14119,7 @@ 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:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Account Management"
 
@@ -14117,118 +14146,114 @@ msgid "Connecting to server..."
 msgstr "Connecting to server..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Check for supported types "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL is not supported in this build of Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL is not supported in this build of evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Displayed Mail Headers</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "A_lso encrypt to self when sending encrypted mail"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Account Information"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Add Sc_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Add new signature..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Al_ways encrypt to myself when sending encrypted mail"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Always _blind carbon-copy (Bcc) to:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Always _carbon-copy (Cc) to:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Attach original message"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Attachment"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Authentication"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "C_olours"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Check _Incoming Mail"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelled words:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Composing Messages"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14244,139 +14269,135 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "De_fault"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Default Behaviour"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Default character _encoding:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Deleting Mail"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Digitally _sign outgoing messages (by default)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "Do _Not Check Incoming Mail For IMAP Accounts"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Do not quote original message"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Don't sign _meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Drafts _folder:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Email Accounts"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Email _address:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Empty _trash folders on exit"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fi_xed -width:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Filter Options"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "H_eaders"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Labels and Colours"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Loading Images"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Message Composer"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Message Display"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Message Fonts"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "New Mail Notification"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14384,139 +14405,139 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optional Information"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganization:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Printed Fonts"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Quote original message"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Quoted"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Re_member this password"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Receiving Email"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Receiving _Options"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Remember this _password"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Required Information"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Restore Defaults"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_ecurity"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Sending Email"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Sent _messages folder:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Sent and Draft Messages"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Server Configuration"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Si_gning certificate:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Specify _filename:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Spell _Checking"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14526,7 +14547,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14536,7 +14557,7 @@ msgstr ""
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14544,15 +14565,15 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Use _Daemon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14562,171 +14583,171 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Always load images off the net"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Always sign outgoing messages when using this account"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Authentication Type: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Authentication type: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automatically check for new mail every"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatically insert smiley images"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Beep when new mail arrives"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirm when expunging a folder"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Default signature:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Defaults"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Do not notify me when new mail arrives"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Enable"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Encrypt outgoing messages (by default)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Full name:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML Mail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identity"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Junk"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Load images if sender is in address book"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "_Local Tests Only"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Never load images off the net"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Play sound file when new mail arrives"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Prompt when sending HTML messages to contacts that don't want them"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Receiving Mail"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Restore defaults"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Select..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Sending Mail"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standard Font:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminal Font:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Use secure connection (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "description"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -14761,12 +14782,12 @@ msgstr "Filtering Folder"
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14775,116 +14796,116 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sending \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Failed on message %d of %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Retrieving %d message(s)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saving %d messsage(s)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14893,7 +14914,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14902,11 +14923,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14915,22 +14936,22 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Changing junk status"
 
@@ -14962,38 +14983,38 @@ msgstr "Encryption"
 msgid "Security Information"
 msgstr "Security Information"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Cancelling..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Path: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Updating..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Waiting..."
 
@@ -16071,7 +16092,7 @@ msgstr "E-Mail Address"
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Enter the password for `%s'"
@@ -17869,22 +17890,6 @@ msgstr "_Send / Receive"
 msgid "_Window"
 msgstr "_Window"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Print Summary"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Print summary"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Reload"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Reload the view"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
@@ -17945,8 +17950,8 @@ msgstr "With _Category"
 msgid "_Tasks"
 msgstr "_Tasks"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18189,23 +18194,23 @@ msgstr "_Search"
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Clear"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Item ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Subitem ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Find _Now"
 
@@ -18219,3 +18224,33 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "No data provided"
+#~ msgstr "No data provided"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Check incoming mail being junk for IMAP accounts"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "Do _Not Check Incoming Mail For IMAP Accounts"
+
+#~ msgid "Print Summary"
+#~ msgstr "Print Summary"
+
+#~ msgid "Print summary"
+#~ msgstr "Print summary"
+
+#~ msgid "Reload"
+#~ msgstr "Reload"
+
+#~ msgid "Reload the view"
+#~ msgstr "Reload the view"
diff --git a/po/en_GB.po b/po/en_GB.po
index cd18723212..a90f03147f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -47,8 +47,7 @@ msgstr ""
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr ""
 
@@ -92,20 +91,20 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -113,72 +112,72 @@ msgstr "Cannot initialise the Evolution shell."
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 #, fuzzy
 msgid "Properties..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 #, fuzzy
 msgid "_Contact"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 #, fuzzy
 msgid "New Contact List"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr ""
 
@@ -191,41 +190,43 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Synchronise \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -233,7 +234,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -241,65 +242,69 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+msgid "The URI that the address book will display"
+msgstr ""
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -343,7 +348,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -376,20 +381,21 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Cannot initialise the Evolution shell."
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Cannot initialise the Evolution shell."
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr ""
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Cannot initialise the Evolution shell."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr ""
 
@@ -399,57 +405,58 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Connecting"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -459,31 +466,31 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -494,7 +501,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -503,7 +510,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -511,40 +518,41 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -553,7 +561,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -561,7 +569,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -571,50 +579,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -622,28 +631,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -651,20 +660,20 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -673,40 +682,40 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Synchronise \"%s\""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr ""
 
@@ -828,7 +837,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr ""
 
@@ -918,10 +927,10 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -970,16 +979,16 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "Colours"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1968,71 +1977,79 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Colours"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Organisation"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr ""
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2040,89 +2057,93 @@ msgstr ""
 msgid "Contact"
 msgstr "Organisation:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Organisation:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Colours"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+msgid "GroupWise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr ""
 
@@ -2282,11 +2303,11 @@ msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2373,13 +2394,13 @@ msgid "Email begins with"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
@@ -2396,101 +2417,101 @@ msgid "Type"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
-msgstr ""
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Cannot initialise the Evolution shell."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2499,8 +2520,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
 
@@ -2543,7 +2564,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr ""
 
@@ -2605,7 +2626,7 @@ msgid "Nickname"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr ""
 
@@ -2614,7 +2635,7 @@ msgid "Office"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2733,64 +2754,69 @@ msgstr "Synchronising \"%s\""
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Colours"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr ""
 
@@ -2799,8 +2825,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2830,7 +2856,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2850,8 +2876,9 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
-msgstr ""
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Cannot initialise the Evolution shell."
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -2985,8 +3012,9 @@ msgid "Add address to existing contact \"%s\""
 msgstr ""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Cannot initialise the Evolution shell."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -3041,18 +3069,41 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Organisation:"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Organisation:"
@@ -3145,7 +3196,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr ""
 
@@ -3324,8 +3375,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr ""
 
@@ -3409,10 +3460,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr ""
 
@@ -3460,26 +3510,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3488,12 +3536,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3501,7 +3549,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3512,20 +3560,20 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3663,24 +3711,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Organisation"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr ""
 
@@ -3707,7 +3761,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
 
@@ -3730,78 +3784,78 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Colours"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Cannot initialise the Evolution shell."
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Colours"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Colours"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3937,7 +3991,7 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4010,7 +4064,7 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr ""
 
@@ -4021,7 +4075,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr ""
 
@@ -4071,7 +4125,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4097,7 +4151,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr ""
 
@@ -4239,7 +4293,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr ""
 
@@ -4331,7 +4385,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Organisation:"
@@ -4479,23 +4533,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4532,8 +4586,8 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr ""
 
@@ -4561,10 +4615,21 @@ msgstr "Could not initialise Bonobo"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, c-format
+msgid "Select destination %s"
 msgstr ""
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Organisation:"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4667,7 +4732,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr ""
 
@@ -4691,23 +4756,31 @@ msgstr ""
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Synchronising \"%s\""
@@ -4785,29 +4858,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -5001,7 +5074,7 @@ msgstr ""
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr ""
 
@@ -5035,7 +5108,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr ""
 
@@ -5074,7 +5147,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5099,7 +5172,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5112,7 +5185,7 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr ""
 
@@ -5125,7 +5198,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr ""
 
@@ -5144,7 +5217,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr ""
 
@@ -5184,16 +5257,16 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5204,7 +5277,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr ""
 
@@ -5392,11 +5465,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr "Colours"
@@ -5422,7 +5494,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr ""
 
@@ -5454,10 +5526,10 @@ msgstr ""
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr ""
@@ -5470,99 +5542,105 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "Cannot initialise the Evolution shell."
@@ -5650,7 +5728,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr ""
 
@@ -5705,26 +5783,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr ""
@@ -5905,7 +5983,7 @@ msgid "Send Latest Information"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
@@ -6361,12 +6439,12 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6374,7 +6452,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6382,40 +6460,50 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1763
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Synchronise \"%s\""
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6533,16 +6621,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6550,7 +6638,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6558,12 +6646,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6752,49 +6840,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr ""
 
@@ -6803,39 +6891,39 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Organisation:"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Organisation:"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6891,25 +6979,25 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -8567,7 +8655,7 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
@@ -8649,7 +8737,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8657,45 +8745,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8703,58 +8787,58 @@ msgid ""
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Synchronising \"%s\""
@@ -8865,21 +8949,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr ""
@@ -9018,7 +9115,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9150,20 +9247,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9225,21 +9309,25 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr ""
@@ -9447,21 +9535,31 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Synchronising \"%s\""
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9477,15 +9575,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Cannot initialise the Evolution shell."
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9505,69 +9598,65 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-#, fuzzy
-msgid "Default"
-msgstr "Synchronising \"%s\""
+#: camel/providers/groupwise/camel-gw-listener.c:323
+msgid "Checklist"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9582,7 +9671,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9591,12 +9680,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9610,25 +9699,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9686,27 +9775,35 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9715,64 +9812,64 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9780,24 +9877,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9818,7 +9923,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Synchronising \"%s\""
@@ -9896,8 +10001,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9909,55 +10014,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9975,49 +10080,44 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10039,9 +10139,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
@@ -10084,149 +10184,133 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10240,10 +10324,15 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr "Synchronising \"%s\""
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Synchronising \"%s\""
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10265,6 +10354,25 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10489,46 +10597,46 @@ msgstr "Synchronising \"%s\""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Synchronise \"%s\""
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10575,7 +10683,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -10655,7 +10763,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -10707,7 +10815,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr ""
 
@@ -10870,7 +10978,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -10976,34 +11084,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11117,82 +11225,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11200,49 +11308,49 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11250,13 +11358,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11607,7 +11715,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr "Synchronising \"%s\""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr ""
@@ -11620,19 +11728,19 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr ""
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11714,7 +11822,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11730,7 +11838,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr ""
 
@@ -11900,7 +12008,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "Cannot initialise the Evolution shell."
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12009,9 +12117,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
 
@@ -12019,25 +12128,25 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -12077,16 +12186,16 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Synchronising \"%s\""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "Synchronising \"%s\""
@@ -12143,9 +12252,9 @@ msgstr "Cannot initialise Evolution's mail summary component."
 msgid "Evolution Mail preferences control"
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr ""
 
@@ -12153,7 +12262,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12193,15 +12302,15 @@ msgstr "Synchronising \"%s\""
 msgid "[script]"
 msgstr ""
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12277,7 +12386,6 @@ msgid "Unread messages"
 msgstr "Synchronising \"%s\""
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12286,382 +12394,399 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
@@ -12704,29 +12829,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -12740,8 +12870,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 ""
 
@@ -12758,19 +12888,23 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+msgid "Error verifying signature"
+msgstr ""
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12782,58 +12916,58 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Synchronising \"%s\""
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise the Evolution shell."
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12878,55 +13012,61 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Colours"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Colours"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Colours"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12935,7 +13075,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -12956,294 +13096,300 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Synchronising \"%s\""
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Default height of the Composer Window"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Default width of the Composer Window"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13251,188 +13397,212 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Synchronising \"%s\""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Synchronising \"%s\""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/importers/elm-importer.c:244
+msgid "Importing Elm data"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, fuzzy, c-format
-msgid "Scanning %s"
-msgstr "Synchronise \"%s\""
-
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Synchronising \"%s\""
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Synchronising \"%s\""
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Synchronise \"%s\""
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Organisation"
+
+#: mail/importers/mail-importer.c:354
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Synchronise \"%s\""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13447,7 +13617,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13455,7 +13625,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13464,49 +13634,47 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-#, fuzzy
-msgid "Scanning mail filters"
-msgstr "Synchronise \"%s\""
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-#, fuzzy
-msgid "Scanning directory"
-msgstr "Synchronising \"%s\""
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
+#: mail/importers/netscape-importer.c:1677
+msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+msgid "Importing Pine data"
+msgstr ""
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr ""
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr ""
 
@@ -13546,19 +13714,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -13607,29 +13775,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Colours"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Colours"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13665,7 +13848,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -13687,120 +13870,116 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13810,485 +13989,481 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Synchronise \"%s\""
@@ -14307,7 +14482,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr ""
 
@@ -14320,169 +14495,169 @@ msgstr "Synchronising \"%s\""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14515,38 +14690,38 @@ msgstr "Synchronising \"%s\""
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr ""
 
@@ -14646,22 +14821,22 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 #, fuzzy
 msgid "vFolders"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr ""
 
@@ -14991,91 +15166,18 @@ msgstr "Synchronising \"%s\""
 msgid "Autocompletion Folders"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shell-folder-commands.c:391
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot delete folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
-#, fuzzy, c-format
-msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
@@ -15201,7 +15303,7 @@ msgstr "Synchronising \"%s\""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15241,6 +15343,10 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15347,125 +15453,6 @@ msgstr ""
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Synchronising \"%s\""
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -15477,11 +15464,6 @@ msgstr "Colours"
 msgid "New"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15742,55 +15724,55 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Synchronising \"%s\""
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Colours"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Synchronising \"%s\""
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr ""
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15851,7 +15833,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr ""
 
@@ -15919,11 +15901,11 @@ msgstr "Organisation"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -15968,211 +15950,211 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr ""
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr ""
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Synchronise \"%s\""
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Organisation"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
@@ -16767,16 +16749,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "Cannot initialise the Evolution shell."
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Cannot initialise the Evolution shell."
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17221,10 +17205,6 @@ msgstr ""
 msgid "HT_ML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr ""
@@ -17590,22 +17570,6 @@ msgstr ""
 msgid "_Window"
 msgstr ""
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr ""
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17668,8 +17632,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr ""
 
@@ -17910,24 +17874,24 @@ msgstr ""
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr ""
 
@@ -17942,6 +17906,52 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "Synchronise \"%s\""
+
+#, fuzzy
+#~ msgid "Scanning directory"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
 #~ msgid "Copy to folder..."
 #~ msgstr "Synchronising \"%s\""
 
@@ -18088,22 +18098,10 @@ msgstr ""
 #~ msgstr "Colours"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Using Email Address"
 #~ msgstr "Synchronising \"%s\""
 
@@ -18140,10 +18138,6 @@ msgstr ""
 #~ msgstr "Colours"
 
 #, fuzzy
-#~ msgid "icsCalendar"
-#~ msgstr "Colours"
-
-#, fuzzy
 #~ msgid "ECard"
 #~ msgstr "Colours"
 
diff --git a/po/es.po b/po/es.po
index 4a031ff8ef..15f6eeb7e8 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-02-29 18:07+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-29 18:10+0100\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.0.2\n"
 
@@ -55,7 +55,6 @@ msgstr "Configure el autocompletado aquí"
 #. 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:363
@@ -98,19 +97,19 @@ msgstr "Control de configuración de preferencias de carpetas de Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Gestione sus certificados S/Mime aquí"
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:225
 #, 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-component.c:269
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-component.c:270
+#: addressbook/gui/component/addressbook-component.c:309
 #: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -118,60 +117,60 @@ msgstr "Libreta de direcciones nueva"
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Falló al conectarse al servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falló al autenticarse con el servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 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:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Error al obtener información del esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "El servidor no respondió con una información del esquema válida"
 
@@ -199,20 +198,18 @@ 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:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "En este equipo"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Privado"
 
@@ -257,11 +254,13 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr ""
+"El soporte de esta libreta de direcciones no pudo analizar esta consulta."
 
 #: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr ""
+"El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
 
 #: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
@@ -373,7 +372,7 @@ msgstr " Mo_strar bases soportadas "
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -417,7 +416,7 @@ msgid "Address Book Sources"
 msgstr "Fuentes de la libreta de direcciones"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Siempre"
 
@@ -452,11 +451,14 @@ msgstr "Dirección de correo-e:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
+msgstr ""
+"Evolution usará este Nombre Distintivo para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor"
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
@@ -476,7 +478,7 @@ msgid "Group:"
 msgstr "Grupo:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nunca"
 
@@ -713,7 +715,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
-msgstr "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
+msgstr ""
+"Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
 
 #: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
@@ -728,7 +731,7 @@ msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
@@ -756,7 +759,7 @@ msgstr "Límite de _descarga:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -803,7 +806,8 @@ msgstr "búsqueda"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaz de selección de nombre de la libreta de direcciones de Evolution"
+msgstr ""
+"Interfaz de selección de nombre de la libreta de direcciones de Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:207
 msgid "Remove All"
@@ -1006,9 +1010,9 @@ msgstr "_Categorías..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2200
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
 #: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -2099,7 +2103,7 @@ msgstr "Domicilio"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Trabajo"
 
@@ -2347,7 +2351,8 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2460,13 +2465,13 @@ msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoría es"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
@@ -2556,7 +2561,7 @@ msgstr "Cortar"
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:360
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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
@@ -2586,7 +2591,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1607
-#: calendar/gui/cal-search-bar.c:353
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
@@ -3117,17 +3122,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"
 
@@ -3253,7 +3258,7 @@ msgstr "Márgenes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opciones"
 
@@ -3384,7 +3389,8 @@ msgid "Export in asynchronous mode "
 msgstr "Exportar en modo asíncrono"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -3394,7 +3400,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -3431,7 +3438,7 @@ msgstr "No ha especificado un nombre de archivo."
 msgid "Unnamed List"
 msgstr "Lista de anónimos"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
 #: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Introduzca contraseña"
@@ -3509,7 +3516,7 @@ msgid "Evolution's Tasks component"
 msgstr "Componente de Tareas de Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3757,33 +3764,43 @@ msgstr "Indica si debe ocultar las áreas terminadas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
-msgstr "Indica si debe establecer un recordatorio predeterminado para los eventos"
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para los eventos"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr "Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
+msgstr ""
+"Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "La descripción contiene"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "No coincidente"
 
 #: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3812,10 +3829,6 @@ msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -3839,70 +3852,70 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "La Agenda «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: calendar/gui/calendar-component.c:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Cita para todo el _día"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "_Agenda"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Crear una agenda nueva"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, 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:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay una agenda disponible para crear eventos y reuniones"
 
@@ -4034,7 +4047,7 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Acción/Disparador"
 
@@ -4106,7 +4119,7 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4167,7 +4180,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Avisos"
 
@@ -4192,7 +4205,7 @@ msgid "Days"
 msgstr "días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Habilitar"
 
@@ -4332,7 +4345,7 @@ msgid "_Fri"
 msgstr "_Vie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_General"
 
@@ -4354,7 +4367,8 @@ msgstr "_Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
@@ -4760,7 +4774,8 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr ""
+"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
@@ -4818,23 +4833,32 @@ msgstr "Planificación"
 msgid "Meeting"
 msgstr "Reunión"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "La fecha de vencimiento es anterior a la fecha de inicio."
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No se pudo abrir la agenda «%s»."
@@ -4908,36 +4932,31 @@ 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:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta por más tiempo."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -5047,15 +5066,18 @@ msgstr "Nombre de la lista de tareas"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5121,7 +5143,7 @@ msgstr "en el"
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -5154,7 +5176,7 @@ msgid "_No recurrence"
 msgstr "Si_n repetición"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Quitar"
 
@@ -5216,13 +5238,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+msgstr ""
+"La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
@@ -5306,16 +5329,16 @@ msgstr "Básico"
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "La fecha de vencimiento es anterior a la fecha de inicio."
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -5326,7 +5349,7 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -5513,7 +5536,7 @@ msgstr "Fecha de inicio"
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr " "
 
@@ -5576,7 +5599,7 @@ msgstr "No"
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconocido"
@@ -5665,7 +5688,7 @@ msgstr "C_ortar"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5774,7 +5797,7 @@ msgid "Alarms"
 msgstr "Alarmas"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Completo"
 
@@ -5803,20 +5826,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5840,10 +5855,6 @@ msgstr "%02i divisiones por minuto"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5851,9 +5862,6 @@ msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6049,7 +6057,7 @@ msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6243,7 +6251,8 @@ msgstr "Actualización terminada\n"
 
 #: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "El estado de asistencia no puede ser actualizado porque no existe el elemento"
+msgstr ""
+"El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
 #: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
 msgid "Object is invalid and cannot be updated\n"
@@ -6413,10 +6422,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-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
@@ -6425,10 +6430,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:1606
 msgid "%m/%d/%Y"
@@ -6517,7 +6518,7 @@ msgstr "Página web:"
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6527,7 +6528,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6538,12 +6539,12 @@ msgstr ""
 "%s\n"
 " se ha colgado."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6552,19 +6553,19 @@ msgstr ""
 "Error al abrir %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Terminando tareas..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Compactando"
 
@@ -6704,11 +6705,11 @@ msgstr "Información de disponibilidad (de %s a %s)"
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un asistente del acontecimiento."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Introduzca su contraseña para %s"
@@ -7009,7 +7010,8 @@ msgstr "Crea una lista de tareas nueva"
 #: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
+msgstr ""
+"No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
 
 #: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
@@ -8682,7 +8684,8 @@ msgstr "Resincronizando con el servidor"
 
 #: camel/camel-disco-folder.c:41
 msgid "Copy folder content locally for offline operation"
-msgstr "Copiar el contenido de la carpeta localmente para operación desconectada"
+msgstr ""
+"Copiar el contenido de la carpeta localmente para operación desconectada"
 
 #: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
@@ -8776,7 +8779,7 @@ msgstr "Argumentos inválidos a (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentos inválidos a (user-tag)"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
@@ -8865,7 +8868,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Cancelado."
 
@@ -8924,7 +8927,8 @@ msgstr "Esta parte del mensaje está firmada digitalmente"
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+msgstr ""
+"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
 #: camel/camel-gpg-context.c:1397
 #, c-format
@@ -8978,7 +8982,8 @@ msgstr "No se pudo bloquear el archivo para %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgstr ""
+"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -9159,7 +9164,8 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr ""
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9167,7 +9173,8 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr ""
+"La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9228,7 +9235,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr ""
+"El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9245,7 +9253,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9457,11 +9465,11 @@ msgstr "No se pudo crear la carpeta: Operación no válida en este almacén"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Spam"
@@ -9480,7 +9488,8 @@ msgstr "No se pudo descifrar la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr ""
+"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
@@ -9733,7 +9742,7 @@ msgstr ""
 "servidor"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronizar automáticamente el correo remoto localmente"
 
@@ -9754,38 +9763,36 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Para acceder a servidores Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Contraseña"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectará con el servidor IMAP usando una contraseña de texto "
 "plano."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Predeterminado"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Neblina gruesa"
 
 #: 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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -9834,21 +9841,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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 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:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9864,25 +9871,25 @@ msgstr ""
 "No se pudo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH."
 
@@ -9939,27 +9946,37 @@ msgstr ""
 "Aplicar filtros a los mensajes nuevos en la bandeja de entrada de este "
 "servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio IMAP para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9968,64 +9985,64 @@ msgstr "Servicio IMAP para %s en %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10036,13 +10053,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10050,19 +10067,20 @@ msgstr "No existe la carpeta %s"
 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:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 "El nombre de la carpeta «%s» es inválido porque no puede contener el "
 "carácter de retorno de carro «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
@@ -10088,7 +10106,7 @@ msgstr ""
 "\n"
 " !!! NO USAR ESTO PARA CORREO EN PRODUCCIÓN  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "No se pudo conectar con el servidor POP en %s"
@@ -10310,9 +10328,9 @@ msgid "Checking for new messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Guardando carpeta"
@@ -10415,75 +10433,75 @@ msgstr "No se pudo renombrar: «%s»: «%s» : %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "No se pudo renombrar «%s» a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "No se pudo abrir la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Análisis erróneo del correo cerca de la posición %ld en la carpeta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No se pudo comprobar la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "No se pudo abrir el archivo %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No se pudo abrir el archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No se pudo cerrar la carpeta origen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No se pudo cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No se pudo cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Resumen y carpeta no concuerdan, incluso después de una sincronización"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "No se pudo almacenar carpeta:: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error la escribir al archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error la escribir al archivo temporal: %s: %s"
@@ -10700,8 +10718,10 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Mostrar carpetas en notación corta (ej: c.o.linux en vez de xomp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Mostrar carpetas en notación corta (ej: c.o.linux en vez de xomp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -10776,7 +10796,8 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "No puede crear una carpeta en un almacén de Noticias: suscríbase en su lugar."
+msgstr ""
+"No puede crear una carpeta en un almacén de Noticias: suscríbase en su lugar."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
 msgid "You cannot rename a folder in a News store."
@@ -10874,7 +10895,7 @@ msgstr "Borrar tras %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Deshabilitar soporte para todas las extensiones POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10935,7 +10956,8 @@ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr ""
+"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
@@ -10963,7 +10985,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10971,7 +10993,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr ""
+"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -11015,7 +11038,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entregar correo por medio de sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11069,7 +11092,8 @@ msgstr "El usuario no es local: lo reenviaré a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Acción solicitada del correo no realizada: el mailbox no está disponible"
+msgstr ""
+"Acción solicitada del correo no realizada: el mailbox no está disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
@@ -11085,7 +11109,8 @@ msgstr "El usuario no es local: pruebe con <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+msgstr ""
+"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11149,7 +11174,8 @@ msgstr "Error de respuesta en STARTTLS"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s."
+msgstr ""
+"El servidor SMTP %s no implementa el método de autenticación requerido %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11181,7 +11207,7 @@ msgstr "Envío de correo SMTP vía %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "No se pudo enviar el mensaje: dirección del remitente no válida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
@@ -11289,34 +11315,34 @@ msgstr "Expiró el tiempo para la solicitud QUIT: %s"
 msgid "QUIT response error"
 msgstr "Respuesta de error a QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -11433,7 +11459,8 @@ msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
 #: composer/e-msg-composer.c:652
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "No se puede firmar el correo saliente: No hay establecido un certificado de "
 "firma para la cuenta remitente"
@@ -11601,7 +11628,8 @@ msgstr ""
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
@@ -11754,16 +11782,12 @@ msgstr "Sincronizando 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"
@@ -11815,31 +11839,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -11975,19 +11991,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Más tarde"
 
@@ -12091,7 +12107,7 @@ msgstr "hace"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segundos"
 
@@ -12452,7 +12468,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -12503,7 +12520,7 @@ msgstr "Correo"
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
@@ -12642,121 +12659,123 @@ msgstr "<pinche aquí para seleccionar una carpeta>"
 msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 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:1760
+#: mail/em-folder-tree.c:1798
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "No se pudo mover la carpeta: «%s»: Operación ilegal"
 
-#: mail/em-folder-tree.c:1789 mail/em-folder-tree.c:1878
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1805 mail/em-folder-tree.c:1818
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
 #: mail/em-folder-view.c:660 mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "No se pudo borrar la carpeta: %s"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "No se pudo borrar la carpeta local %s."
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «%s» y todas sus subcarpetas?"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Borrar «%s»"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "No se pudo renombrar la carpeta local %s."
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2142
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
+msgstr ""
+"Ya existe una carpeta llamada «%s». por favor, use un nombre diferente."
 
-#: mail/em-folder-tree.c:2188 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2189
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: mail/em-folder-tree.c:2204 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
@@ -12888,6 +12907,12 @@ msgstr "Filtro según la lista de _correo"
 msgid "Filter on Thread"
 msgstr "Filtro según la conversación"
 
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Predeterminado"
+
 #: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Imprimir mensaje"
@@ -13105,7 +13130,7 @@ msgid "Bcc"
 msgstr "Cco"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:739
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -13137,15 +13162,20 @@ msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encripyed"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
@@ -13165,22 +13195,22 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, 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:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Falló  al migrar el extado de expansión de la carpeta : %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Fallo al crear directorio  «%s»: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Fallo al abrir almacén para «%s»: %s"
@@ -13306,12 +13336,18 @@ msgstr "Guardar mensaje..."
 msgid "Add address"
 msgstr "Añadir dirección"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Correo de %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No se pudo crear el directorio temporal: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13324,7 +13360,7 @@ msgstr ""
 "\n"
 "¿Quiere borrar realmente esos mensajes?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13349,96 +13385,92 @@ msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es spam"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Comprobar si el correo entrante es spam en las cuentas IMAP"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Color de resaltado de citas"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Color de resaltado de citas."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Altura predeterminada de la ventana de redacción de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Altura predeterminada de la ventana del redacción de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Altura predeterminada de la ventana del mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Habilitar/deshabilitar modo cursor"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13449,15 +13481,15 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de Gnome puede usarse para "
 "mostrar el contenido."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13466,11 +13498,11 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si están activadas."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13479,15 +13511,15 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:31
 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:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13497,177 +13529,171 @@ msgstr ""
 "Nunca cargar imágenes desde la red 1 - Cargar imágenes si el remitente está "
 "en la libreta de direcciones 2 - Siempre cargar imágenes desde la red"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista preliminar del mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la vista preliminar del mensaje."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensaje"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Estilo del mensaje (normal, cabeceras completas, fuente)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Archivo de sonido de notificación de correo nuevo"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Tipo de notificación de correo nuevo"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
 
-#: mail/evolution-mail.schemas.in.in.h:50
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacta"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellena el campo CCo"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Preguntar al mandar mensajes que sin destinatarios Para o Cc"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intenta enviar HTML no deseado"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Ejecutar la prueba de spam en el correo entrante"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Ejecutar el test de spam en el correo entrante de las cuentas IMAP "
-"(sólo válido si check_incoming está puesto a «true»)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Mostrar imágenes animadas como animaciones."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar mensajes borrados (tachados) en la lista de mensajes."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensajes borrados en la lista de mensajes"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr ""
+"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "La tipografía de terminal para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "La letra de anchura variable para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13679,99 +13705,99 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt; - establece activado si la cabecera "
 "se debe mostrar en la vista de correo."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Lista de mensajes por conversaciones."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Lista de mensajes por conversaciones"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Conversaciones basadas en el asunto"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar un mensaje como visto"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar un mensaje como visto."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usar el demonio y cliente de Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Usar el demonio y cliente de Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar tipografía personalizada para mostrar el correo"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Usar sólo los tests de spam local."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sólo los tests de spam local (Sin DNS)"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "El elemento del menú «Ver/Cco» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "El elemento del menú «Ver/Cco» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "El elemento del menú «Ver/Cc» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "El elemento del menú «Ver/Cc» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "El elemento del menú «Ver/Desde» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "El elemento del menú «Ver/Desde» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "El elemento del menú «Ver/Publicar en» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "El elemento del menú «Ver/Publicar en» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "El elemento del menú «Ver/Responder a» está marcado"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "El elemento del menú «Ver/Responder a» está marcado."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13779,11 +13805,11 @@ msgstr ""
 "Indica si se debe o no volver al hilado de conversaciones por asuntos cuando "
 "los mensajes no contienen cabeceras In-Reply-To o References"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "puerto pariniciar el spamd ejecutado por el usuario"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "puerto spamd"
 
@@ -13820,15 +13846,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando su correo antiguo de Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Por favor espere"
@@ -13849,22 +13875,22 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta enla que importar"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
@@ -14023,15 +14049,15 @@ msgstr "No ha rellenado toda la información requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "R_uta:"
 
@@ -14083,27 +14109,42 @@ msgstr ""
 "    «%s»\n"
 "Y han sido actualizadas."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nueva carpeta virtual"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtros de correo"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Crear una agenda nueva"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI de la fuente de correo que la vista mostrará"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identidad"
 
@@ -14147,7 +14188,7 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Gestión de la cuenta"
 
@@ -14174,118 +14215,114 @@ msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL no está soportado en esta compilación de Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL no está implementado en esta compilación de Evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>Cabeceras de correo _visibles</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_También cifrar a mí mismo cuando envíe correo cifrado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Añadir sc_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Añadir firma nueva..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a mí mismo cuando envíe correo cifrado"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Siempre mandar copia de carbón oc_ulta (Cco) a:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Siempre mandar _copia de carbón (Cc) a:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Siempre _confiar en las claves de mi anillo cuando cifre"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Adjuntar mensaje original"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Conjunto de carac_teres:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "C_olores"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Comprobar si hay correo _entrante"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Verificar orto_grafía mientras se escribe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprueba si el correo entrante es spam"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Redacción de mensajes"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configuración"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14301,277 +14338,274 @@ msgstr ""
 "\n"
 "Pulse «Finalizar» para guardar su configuración."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Comportamiento predefinido"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Codificación de caracteres predeterminada: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Borrado del correo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Firm_ar digitalmente el correo saliente (por omisión)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "No comprobar correo entrante de las cuentas IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "No citar el mensaje original"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Cuentas de correo"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Dir_ección de correo:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Vaciar _papelera al salir"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Certificado de _cifrado:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "A_nchura fija:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Opciones de filtros"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Propiedades de tipografías"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Dar formato _HTML a los mensajes"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Cabeceras"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Resaltar texto citado con este color:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Incluido en línea"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiquetas y colores"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Carga de imágenes"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Localización del Mailbox"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Editor de mensajes"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Pantalla del mensaje"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Tipografías del mensaje"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notificación de correo nuevo"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Información opcional"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Elija un color"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan sólo tengan definido el _Cco"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Tipografías impresas"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citar el mensaje original"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Re_cuerda esta contraseña"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Opciones de recepción"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Recuerda esta co_ntraseña"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Volver a predeterminados"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_eguridad"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensajes enviados y borradores"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Certificado de _firma:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "O_rtografía"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Mailbox estándar de Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14581,7 +14615,7 @@ msgstr ""
 "firma. El nombre que especifique será usado\n"
 "únicamente para mostrarlo por pantalla."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14591,7 +14625,7 @@ msgstr ""
 "y el idioma. La lista de idiomas de abajo refleja únicamente los idiomas "
 "para los cuales hay instalado un diccionario."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14599,15 +14633,15 @@ msgstr ""
 " Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 " Por ejemplo: «Trabajo» o «Personal»"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Usar _demonio"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14617,171 +14651,171 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "C_argar siempre las imágenes desde la red"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticación: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar el correo _automáticamente cada"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Insertar emoticonos _automáticamente"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "E_mitir un pitido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmar antes de compactar una carpeta"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Firma predeterminada:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Pre_determinados"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No notificarme cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Cifrar mensajes salientes (por omisión)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Correo en _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identidad"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Spam"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imágenes si el remitente está en la libreta de direcciones"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Pruebas _locales únicamente"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca imágenes desde la red"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Reproducir un archivo de _sonido cuando llegue correo nuevo"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vacío"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Recepción de correo"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Restablecer predeterminados"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Guión:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "En_vío de correo"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Mo_strar imágenes animadas"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Firmas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Tipografía _estándar"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Tipografía del _terminal"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "U_sar conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -14816,12 +14850,12 @@ msgstr "Filtrando carpeta"
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falló al aplicar los filtros al correo saliente: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14830,116 +14864,116 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "Anexando a la carpeta local «Correo enviado» en su lugar."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando «%s»"
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14948,7 +14982,7 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14957,11 +14991,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14970,22 +15004,22 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Cambiar el estado de spam"
 
@@ -15017,38 +15051,38 @@ msgstr "Cifrado"
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ruta: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Esperando..."
 
@@ -15405,8 +15439,10 @@ msgstr ""
 "desarrollo de Evolution no se mostrará."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Path to the default calendar folder"
@@ -15700,7 +15736,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -15716,7 +15753,8 @@ msgstr "'.' y '..' son nombres reservados de carpetas."
 
 #: shell/e-shell-window-commands.c:63
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: shell/e-shell-window-commands.c:71
 #, c-format
@@ -15748,7 +15786,8 @@ msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution está conectado.  Pulse este botón para trabajar "
 "desconectado."
@@ -15758,7 +15797,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution está desconectado.  Pulse este botón para trabajar "
 "conectado."
@@ -16308,7 +16348,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene certificados en el archivo que identifican a estas autoridades de "
 "certificación:"
@@ -16982,7 +17023,8 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -17041,8 +17083,10 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18258,6 +18302,22 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Comprobar si el correo entrante es spam en las cuentas IMAP"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Ejecutar el test de spam en el correo entrante de las cuentas IMAP (sólo "
+#~ "válido si check_incoming está puesto a «true»)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "No comprobar correo entrante de las cuentas IMAP"
+
 #~ msgid "No data provided"
 #~ msgstr "No se proporcionaron datos"
 
@@ -27518,9 +27578,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Moderate mist"
 #~ msgstr "Neblina moderada"
 
-#~ msgid "Thick mist"
-#~ msgstr "Neblina gruesa"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Cortina de neblina"
 
@@ -28601,4 +28658,3 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
-
diff --git a/po/et.po b/po/et.po
index 8be990a430..fc62013c45 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,14 +13,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.4.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-27 03:15+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2003-09-25 17:24+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -56,7 +56,6 @@ msgstr "Loob või muudab mailikontosid ja muid sätteid"
 #. 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:363
@@ -100,20 +99,20 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:269
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "New Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -121,60 +120,60 @@ msgstr "Aadressiraamat"
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Loo uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Loo uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -199,20 +198,18 @@ msgid "Migrating `%s':"
 msgstr "Kontrollin %s"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
@@ -372,7 +369,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -419,7 +416,7 @@ msgid "Address Book Sources"
 msgstr "Aadressiraamatu allikas"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alati"
 
@@ -478,7 +475,7 @@ msgid "Group:"
 msgstr "Grupp"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Mitte kunagi"
 
@@ -702,7 +699,7 @@ msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
@@ -730,7 +727,7 @@ msgstr "_Allalaadimise piirang:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -999,9 +996,9 @@ msgstr "Kate_gooriad..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2200
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
 #: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -2112,7 +2109,7 @@ msgstr "Kodu"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "Töönädal"
@@ -2497,13 +2494,13 @@ msgid "Email begins with"
 msgstr "E-post algab stringiga"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
@@ -2525,96 +2522,96 @@ msgstr "Tüüp"
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
-#: addressbook/gui/widgets/e-addressbook-view.c:2015
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1044
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Mine kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1051
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Otsi kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1054
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot pihuarvuti sätted..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Saada kontakt edasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Aadressiraamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Aadressiraamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
 #: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Käesolev vaade"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1266
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2623,8 +2620,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1606
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
@@ -2667,7 +2664,7 @@ msgid "Company Phone"
 msgstr "Firma telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:441 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2885,7 +2882,7 @@ msgid "map"
 msgstr "Amapala"
 
 #: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:417
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Liikmed"
@@ -2935,17 +2932,17 @@ msgid "WWW"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:476
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:437
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Ameti_nimetus:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:468
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Kodune faks"
@@ -3196,18 +3193,18 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "Nädala vaade"
 
-#: 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
 #, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 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 ""
 
@@ -3335,7 +3332,7 @@ msgstr "Veerised"
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Häälestus"
 
@@ -3518,7 +3515,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
 #: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
@@ -3607,7 +3604,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution'i sõnumikausta kuvamise komponent."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3873,23 +3870,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Kirjeldus sisaldab"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3921,12 +3925,8 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3948,76 +3948,76 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Uus-Kaledoonia"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Kokkusaamine"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Lisab uue kokkusaamise"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Koosolek"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Uus kogu päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Kogu _päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava kokkusaamise"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Uus-Kaledoonia"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Loo uus kontakt"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4154,7 +4154,7 @@ msgstr "tundi"
 msgid "minutes"
 msgstr "minutit"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4227,7 +4227,7 @@ msgid "hour(s)"
 msgstr "tund(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -4238,7 +4238,7 @@ msgstr "kokkusaamise algust"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 #, fuzzy
 msgid "Enabled"
 msgstr "Luba"
@@ -4295,7 +4295,7 @@ msgstr "30 minutit"
 msgid "60 minutes"
 msgstr "60 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4320,7 +4320,7 @@ msgid "Days"
 msgstr "Päev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "E_nable"
 msgstr "Luba"
@@ -4463,7 +4463,7 @@ msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Üldine"
 
@@ -4956,23 +4956,31 @@ msgstr "Planeering"
 msgid "Meeting"
 msgstr "Koosolek"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Juurdepääs keelatud"
@@ -5047,36 +5055,31 @@ 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:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
@@ -5274,7 +5277,7 @@ msgstr "iga"
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Kuupäev ja kell:"
@@ -5308,7 +5311,7 @@ msgid "_No recurrence"
 msgstr "E_i kordu"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Eemalda"
 
@@ -5375,7 +5378,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5461,16 +5464,16 @@ msgstr "Peamine"
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aadressiraamatu avamine ebaõnnestus"
@@ -5481,7 +5484,7 @@ msgstr "_Salajane"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5678,7 +5681,7 @@ msgstr "Algab kuupäeval"
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr " värvusega"
@@ -5740,10 +5743,10 @@ msgstr "Ei"
 #: 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:1673 camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tundmatu"
@@ -5832,7 +5835,7 @@ msgstr "_Lõika"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5942,7 +5945,7 @@ msgid "Alarms"
 msgstr "Alarmid"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -5971,20 +5974,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -6008,33 +6003,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pl"
@@ -6217,7 +6205,7 @@ msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
@@ -6580,10 +6568,6 @@ msgstr "%A, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-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
@@ -6592,10 +6576,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:1606
 msgid "%m/%d/%Y"
@@ -6683,12 +6663,12 @@ msgstr "Tä_htsus:"
 msgid "Web Page:"
 msgstr "Lehekülg"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2176
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Ülesande lisamiseks vajuta siia"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1920
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6698,7 +6678,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6706,12 +6686,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6720,39 +6700,39 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Kalendri laadimine"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1751
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Kalendri laadimine"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1763
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/gnome-cal.c:1800
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/gnome-cal.c:1949
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6760,7 +6740,7 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2803
+#: calendar/gui/gnome-cal.c:2799
 #, fuzzy
 msgid "Purging"
 msgstr "Trüki"
@@ -6872,11 +6852,11 @@ msgstr ""
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
@@ -8945,7 +8925,7 @@ msgstr ""
 msgid "Invalid arguments to (user-tag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
@@ -9029,9 +9009,9 @@ msgid ""
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1271
-#: camel/camel-gpg-context.c:1430 camel/camel-gpg-context.c:1516
-#: camel/camel-gpg-context.c:1623 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 #, fuzzy
 msgid "Cancelled."
 msgstr "Katkestatud"
@@ -9045,16 +9025,12 @@ msgstr ""
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus POP serverilt: %s"
 
-#: camel/camel-gpg-context.c:815
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:855
+#: camel/camel-gpg-context.c:847
 #, 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:1132
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9062,62 +9038,62 @@ msgid ""
 "%s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1137
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1250 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/camel-gpg-context.c:1264 camel/camel-gpg-context.c:1672
-#: camel/camel-gpg-context.c:1723
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1422
-#: camel/camel-gpg-context.c:1509 camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1616 camel/camel-gpg-context.c:1640
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1745
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Autentimine ebaõnnestus.\n"
 
-#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1389 camel/camel-gpg-context.c:1398
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, 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:1405
+#: camel/camel-gpg-context.c:1397
 #, 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:1492
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1647 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Sisu sisaldab"
 
-#: camel/camel-gpg-context.c:1651
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Vigane sõnumi sisu"
@@ -9405,7 +9381,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -9627,12 +9603,12 @@ msgstr ""
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 #, fuzzy
 msgid "Trash"
 msgstr "Ülesanne"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9868,6 +9844,16 @@ msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Ajutise kausta sulgemine ebaõnnestus: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Ajutise kausta sulgemine ebaõnnestus: %s"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9884,7 +9870,7 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
@@ -9908,37 +9894,34 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Parool"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
+#: camel/providers/groupwise/camel-gw-listener.c:323
 #, fuzzy
-msgid "Default"
-msgstr "Kustuta"
+msgid "Checklist"
+msgstr "Ülesannete nimekiri"
 
 #: 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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -9985,21 +9968,21 @@ msgstr "Ei saa avada kausta '%s'"
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida '%s' ülesandeid"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 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:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10013,25 +9996,25 @@ msgid ""
 "  %s"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
@@ -10091,27 +10074,37 @@ msgstr "Nimi"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "LDAP server"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s teenus %s jaoks %s peal"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10120,15 +10113,15 @@ msgstr "%s teenus %s jaoks %s peal"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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
@@ -10136,51 +10129,51 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr "Katkestatud"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentimine ebaõnnestus."
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: camel/providers/imap/camel-imap-store.c:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10188,13 +10181,13 @@ msgid ""
 "\n"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10202,18 +10195,18 @@ msgstr "Kausta %s ei leitud"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10236,7 +10229,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
@@ -10462,9 +10455,9 @@ msgid "Checking for new messages"
 msgstr "Kontrollin uute sõnumite olemasolu"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
@@ -10570,75 +10563,75 @@ msgstr "Ei saa laadida '%s' ülesandeid"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ajutisse kirjakasti kirjutamine ebaõnnestus: %s: %s"
@@ -11024,7 +11017,7 @@ msgstr "Kustuta %s päeva möödumisel"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11106,7 +11099,7 @@ msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sendmail"
 msgstr "Saada sõnum"
@@ -11162,7 +11155,7 @@ msgstr "Saada sõnum"
 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:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11333,7 +11326,7 @@ msgstr "SMTP posti saatmine %s kaudu"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 #, fuzzy
 msgid "Sending message"
 msgstr "Vigane koosoleku sõnum"
@@ -11450,34 +11443,34 @@ msgstr "AUTH päring ületas ajalimiidi: %s"
 msgid "QUIT response error"
 msgstr "RSET vastuse viga: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Sõnumi vastuvõtmine nurjus"
@@ -11915,8 +11908,6 @@ msgstr "Kategooriad"
 
 #. 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
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
@@ -11924,8 +11915,6 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %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
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
@@ -11986,32 +11975,24 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y"
 
 #. 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
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -12163,21 +12144,21 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Important"
 msgstr "Impordi..."
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
 msgstr "pärast"
@@ -12294,7 +12275,7 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuu(d)"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 #, fuzzy
 msgid "seconds"
 msgstr "teine"
@@ -12772,7 +12753,7 @@ msgstr "Postiprogramm:"
 msgid "Mail Accounts"
 msgstr "Kontod"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12820,17 +12801,17 @@ msgstr "Stiili nimi:"
 msgid "[script]"
 msgstr "Kirjeldus puudub"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Keel"
 
-#: mail/em-composer-prefs.c:900
+#: mail/em-composer-prefs.c:922
 #, fuzzy
 msgid "Add script signature"
 msgstr "Lisa tingimus"
 
-#: mail/em-composer-prefs.c:920
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "minuti(t)"
@@ -12920,134 +12901,135 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo _uus kaust..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "_Kaust:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 #, fuzzy
 msgid "VFolders"
 msgstr "_Kaust:"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Laen..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:1760
+#: mail/em-folder-tree.c:1798
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: mail/em-folder-tree.c:1789 mail/em-folder-tree.c:1878
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1805 mail/em-folder-tree.c:1818
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
 #: mail/em-folder-view.c:660 mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder"
 msgstr "Vali ülesannete kaust"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Loo uue kausta"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2094
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2110
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Kustuta"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Kausta nime muutmine"
 
-#: mail/em-folder-tree.c:2142
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2188 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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
 #, fuzzy
 msgid "_View"
 msgstr "Päeva vaade"
 
-#: mail/em-folder-tree.c:2189
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ava uues aknas"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "_E"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Mine kausta..."
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2238
 #, fuzzy
 msgid "_Rename"
 msgstr "_Eemalda"
 
-#: mail/em-folder-tree.c:2204 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 #, fuzzy
 msgid "_Properties..."
 msgstr "Kate_gooriad..."
@@ -13200,6 +13182,13 @@ msgstr "Filter  p_ostiloendi järgi"
 msgid "Filter on Thread"
 msgstr "Nurjumine teate %d juures"
 
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default"
+msgstr "Kustuta"
+
 #: mail/em-folder-view.c:1660
 #, fuzzy
 msgid "Print Message"
@@ -13210,7 +13199,7 @@ msgstr "Trüki ülesanded"
 msgid "_Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/em-folder-view.c:2171
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -13420,7 +13409,7 @@ msgid "Bcc"
 msgstr "Pimekoopia"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:632
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
@@ -13454,16 +13443,21 @@ msgstr "Ei saa saata sõnumit: %s"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Toetamata skeem"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Sertifikaatide kontroll ebaõnnestus."
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Sertifikaatide kontroll ebaõnnestus."
@@ -13480,22 +13474,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Ei saa avada '%s' kausta"
@@ -13636,12 +13630,18 @@ msgstr "Serveri teade:"
 msgid "Add address"
 msgstr "Aadress"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Sõnumi saatja: %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13654,7 +13654,7 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13682,340 +13682,330 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Lõikab valitud sõnumid"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Lõikab valitud sõnumid"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Vaikimisi tähtsus:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
 msgstr "Lülitab kaustade riba sisse või välja"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Lõikab valitud sõnumid"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Vaikimisi tähtsus:"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Lülitab kaustade riba sisse või välja"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Lülitab kaustade riba sisse või välja"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Saada sõnum hiljem"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Kontod"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Logi filtreerimised faili:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "E-posti seadistamine"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "E-posti seadistamine"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 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:54
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Saata HTML sõnum?"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Saata HTML sõnum?"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Näita kontakte"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Näita aega kui"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Näita sõnumit normaalse stiiliga"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Eelvaate paan"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Esialgne kontakt:"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -14023,113 +14013,113 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Muutlik"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 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:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Impordi"
@@ -14177,16 +14167,16 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 #, fuzzy
 msgid "Importing..."
 msgstr "Impordi..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
@@ -14209,24 +14199,24 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Vali ülesannete kaust"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Vali tegevus"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Impordi..."
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 #, fuzzy
 msgid "Importing mailbox"
@@ -14374,17 +14364,17 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr "Evolution'i uudiseredaktor"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Host:"
 msgstr "Kodu"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Serveri nimi:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
 msgstr "_Perekonnanimi:"
@@ -14434,31 +14424,46 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Kalendri sõnum"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sõnumi koostamine"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "_Kaust:"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Postiprogramm:"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Loo uus kontakt"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, mida kalender näitab"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identiteet"
 
@@ -14510,7 +14515,7 @@ msgstr ""
 "parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
 "interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Account Management"
 msgstr "Konto nimi"
@@ -14534,131 +14539,127 @@ msgid "Connecting to server..."
 msgstr "Ühendan uuesti LDAP serveriga..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Tuvasta toetatavad tüübid"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "See šiffer ei toeta allkirjastamist"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "Kontaktiredaktor"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Account Information"
 msgstr "Info puudub"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Lisa tingimus"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Lisa sõnumile manus"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentimine ebaõnnestus."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Tundmatu märgistik: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Sulge"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Täna lõppevate ülesannete värvus"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Sõnumi koostamine"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Configuration"
 msgstr "Info puudub"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14675,355 +14676,351 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Lõpeta\"."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Vaikimisi tähtsus:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Vaikimisi kodeering: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Koosoleku ettepanek<b>%s</b> soovib lisada olemasolevale koosolekule"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 #, fuzzy
 msgid "Done"
 msgstr "Puudub"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Kaust:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Kirjaalarmi häälestus"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "E-posti _aadress:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikaadi ID:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Käivita tegevused"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "lõppeb"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Häälestus"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Töös"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Edasi saadetud sõnumid"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Päis"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Rõhuta tsitaate"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Inline"
 msgstr "Lükka tagasi"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Kerberos "
 msgstr "Liikmed"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvesta ja sulge"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Kalendri laadimine"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "LDAP konfigureerimise abimees"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sõnumialarmi häälestus"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Näidatav sõnum:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Sõnumialarmi häälestus"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Optional Information"
 msgstr "koosoleku info"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "T_öökoht:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Võtme ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vali värvus"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, 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"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Trüki kirje"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastus:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "_Häälestus"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Jäta see parool meelde"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "iKalendri informatsioon"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sending Email"
 msgstr "Saada sõnum"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Vigane ülesande sõnum"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Samm 1: serveri info"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "_Serveri nimi:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15034,202 +15031,202 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Järgmine\". "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati võrgust"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autentimine ebaõnnestus."
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autentimine ebaõnnestus."
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Kausta puhastamisel küsi kinnitust"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Vaikimisi tähtsus:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "Täpsustused"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Luba"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_Edasta iKalendrina"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ees- ja perekonna_nimi"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Saata HTML sõnum?"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "_P"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Märgi sõnum loetuks peale"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
 msgstr "Nimi"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Ära lae ühtegi pilti võrgust"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Täpsustus, kui püütakse saata sõnumit ilma teemata"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vasta kõigile"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Valitud:"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Saada sõnum"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Näita aega kui"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Olek:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Esialgne kontakt:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Kasuta turvalist ühendust (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "description"
 msgstr "Kirjeldus:"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
@@ -15263,173 +15260,173 @@ msgstr "Filtreerin kausta"
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Saadan \"%s\""
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 #, fuzzy
 msgid "Complete."
 msgstr "Lõpetatud"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kaustade sünkroniseerimine"
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Nurjumine teate %d juures"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Kaustade sünkroniseerimine"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Avan %s ülesanded"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Meeldetuletajad"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Kaustade sünkroniseerimine"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Kaustade sünkroniseerimine"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Kausta sünkroniseerimine"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Kausta sünkroniseerimine"
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Võetakse vastu teadet %d (%d%%)"
 
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d sõnumit"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Viga %s salvestamisel: %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "EI saa käivitada wombatit"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Ühendan uuesti LDAP serveriga..."
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15467,42 +15464,42 @@ msgstr "Erandid"
 msgid "Security Information"
 msgstr "Vaba/hõivatud info"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 #, fuzzy
 msgid "Cancelling..."
 msgstr "Otsin..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tüüp:"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Saada sõnum"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Tühista"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 #, fuzzy
 msgid "Updating..."
 msgstr "Laen..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 #, fuzzy
 msgid "Waiting..."
 msgstr "Laen..."
@@ -28877,10 +28874,6 @@ msgstr "(%) valmis"
 #~ msgid "Moderate mist"
 #~ msgstr "Keskmise hajusat udu"
 
-#, fuzzy
-#~ msgid "Thick mist"
-#~ msgstr "Ülesannete nimekiri"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Madal hajus udu"
 
diff --git a/po/eu.po b/po/eu.po
index b97c385737..c72586da00 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Waliño <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -49,8 +49,7 @@ msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -98,20 +97,20 @@ msgstr "Evolution-en Zereginen kontrolerako fabrika."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Helbide-liburua"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -119,45 +118,45 @@ msgstr "Helbide-liburua"
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Kontaktu berria:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktuen zerrenda"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Ezin da LDAP zerbitzariarekin konektatu."
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -165,33 +164,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Zain..."
@@ -205,43 +204,45 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s eskaneatzen"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Egite-data"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -249,7 +250,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -257,19 +258,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -278,7 +279,7 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -288,7 +289,7 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -300,7 +301,7 @@ msgstr ""
 "programa konpilatu behar duzu CVS iturburuetatik\n"
 "beheko estekatik OpenLDAP eskuratuz.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -310,15 +311,15 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Ezin da helbide-liburua ireki"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -326,16 +327,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "Egutegiak bistaratuko duen URIa"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -380,7 +386,7 @@ msgstr "_Begiratu zein mota onartzen diren"
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -414,20 +420,21 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Helbide-liburuaren iturburuak"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Helbide-liburuaren iturburuak"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Helbide-liburuaren iturburuak"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "_Helbide-liburuaren iturburuak..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarmak"
@@ -439,66 +446,67 @@ msgstr "Anonimoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Izen bereizitua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "_Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "_Bilatu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Taldea"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -508,32 +516,32 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Bat"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Ezabatuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -544,7 +552,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -553,7 +561,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -561,42 +569,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Iturburu-informazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Onartzen ez den eskema"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -605,7 +614,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -613,7 +622,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -623,32 +632,33 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
 "baduzu, helbide-liburuaren funtzionamendua mantsotuko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -658,7 +668,7 @@ msgstr ""
 "izan hemen \"Helbide elektronikoa\" ezartzen baduzu sarbide anonimoa beharko "
 "duzula zure ldap zerbitzarirako."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -668,7 +678,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -678,7 +688,7 @@ msgstr ""
 "Izen hau erabiliko da zure kontua identifikatzeko.  Bistaratzeko bakarrik "
 "erabiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -686,30 +696,30 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizitua (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -717,21 +727,21 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -740,45 +750,45 @@ msgstr "_Deskarga-muga"
 msgid "_Edit"
 msgstr "_Edizioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Ataka:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Search base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Zer_bitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "cards"
 msgstr "Txartelik ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 #, fuzzy
 msgid "general-tab"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "searching-tab"
 msgstr "Bilaketa"
@@ -908,7 +918,7 @@ msgstr "Lankidetza"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -1009,10 +1019,10 @@ msgstr "Ka_tegoriak..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1064,16 +1074,16 @@ msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "Helbi_dea:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2066,74 +2076,82 @@ msgid "AOL Instant Messenger"
 msgstr "Aurreko mezua"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Kontaktu-zerrenda izengabea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Posta-mezua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Zerbitzua prest"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "K_okalekua:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Erabiltzaile-izena:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Etxekoa"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Iturburua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2141,94 +2159,99 @@ msgstr ""
 msgid "Contact"
 msgstr "Kontaktuak"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Txad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Kontuaren izena"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategoria-editorea ez dago erabilgarri."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Gorde kontaktua VCard gisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Lanekoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Taldea"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Editatu osorik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Izen osoa:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2397,11 +2420,11 @@ msgid "Is New List"
 msgstr "Zerrenda berria"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2497,13 +2520,13 @@ msgid "Email begins with"
 msgstr "honela amaitzen da"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategoria da"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka"
 
@@ -2520,108 +2543,108 @@ msgid "Type"
 msgstr "Mota"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Helbide-liburua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Helbide-liburua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2630,8 +2653,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
@@ -2674,7 +2697,7 @@ msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Helb. el."
 
@@ -2736,7 +2759,7 @@ msgid "Nickname"
 msgstr "Goitizena"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Oharra"
 
@@ -2745,7 +2768,7 @@ msgid "Office"
 msgstr "Bulegoa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Erakundea"
 
@@ -2882,68 +2905,74 @@ msgstr "Ezabatuta"
 msgid "Has Cursor"
 msgstr "Zereginen ordena"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Kideak"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Cork"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Taldea"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Pownal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Kar_gua: "
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Etxeko faxa"
@@ -2953,8 +2982,8 @@ msgid "Success"
 msgstr "Behar bezala egin da"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2986,7 +3015,7 @@ msgstr "Protokoloa ez da onartzen"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3009,7 +3038,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
-msgid "Addressbook does not exist"
+msgid "Address Book does not exist"
 msgstr "'%s' fitxategia ez dago "
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3153,7 +3182,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3213,18 +3243,41 @@ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution-en Inportatzeko laguntzailea"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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 "Inprimatu gutun-azala"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Inprimatu hautatutako kontaktuak"
@@ -3317,7 +3370,7 @@ msgstr "Marjinak"
 msgid "Number of columns:"
 msgstr "Zutabe-kopurua:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Aukerak"
 
@@ -3501,8 +3554,8 @@ msgstr "Ez da fitxategi-izenik eman."
 msgid "Unnamed List"
 msgstr "Kontaktu-zerrenda izengabea"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
@@ -3590,10 +3643,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution-en mezu-prestatzailea."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Zereginak"
 
@@ -3639,26 +3691,24 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Ireki"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Ireki"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3667,12 +3717,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Abisua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3684,7 +3734,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3701,19 +3751,19 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Ezin izan da gnome-vfs hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
@@ -3860,24 +3910,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Egutegia"
 
@@ -3910,7 +3966,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3932,78 +3988,78 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Kaledonia berria"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Bilera"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria."
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Kaledonia berria"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Egutegia"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Sortu karpeta berria"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4144,7 +4200,7 @@ msgstr "ordu "
 msgid "minutes"
 msgstr "minutu "
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4218,7 +4274,7 @@ msgid "hour(s)"
 msgstr "ordu"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -4229,7 +4285,7 @@ msgstr "hitzordu-hasiera baino"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Gaituta"
 
@@ -4281,7 +4337,7 @@ msgstr "30 minutu"
 msgid "60 minutes"
 msgstr "60 minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4307,7 +4363,7 @@ msgid "Days"
 msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Gaitu"
 
@@ -4453,7 +4509,7 @@ msgid "_Fri"
 msgstr "_Or."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Orokorra"
 
@@ -4551,7 +4607,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Z_ereginen zerrenda"
@@ -4702,23 +4758,23 @@ msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 msgid "Validation error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr "- "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr "(Eginda "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Eginda "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr "(Falta: "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Falta: "
 
@@ -4755,8 +4811,8 @@ msgstr "Egunkariko sarrera - %s"
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Gorde honela..."
 
@@ -4785,11 +4841,21 @@ msgstr "Utzi bertan behera eragiketa"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Egutegia"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Z_ereginen zerrenda"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4898,7 +4964,7 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Hitzordua"
 
@@ -4922,25 +4988,33 @@ msgstr "Antolaketa"
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Hasiera-data"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Hasiera-ordua:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Baimena ukatuta"
@@ -5022,29 +5096,29 @@ msgstr "_Hasiera-ordua:"
 #. 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
@@ -5248,7 +5322,7 @@ msgstr "-"
 msgid "occurrences"
 msgstr "aldiz"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Ordua:"
@@ -5285,7 +5359,7 @@ msgid "_No recurrence"
 msgstr "E_rrepikapenik ez"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -5328,7 +5402,7 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5355,7 +5429,7 @@ msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Eginda "
@@ -5369,7 +5443,7 @@ msgstr "% Osatuta"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Eginda"
 
@@ -5382,7 +5456,7 @@ msgstr "Handia"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Egiten ari da"
 
@@ -5401,7 +5475,7 @@ msgstr "Normala"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Ez da hasi"
 
@@ -5443,16 +5517,16 @@ msgstr "Oinarrizkoa"
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin da helbide-liburua ireki"
@@ -5463,7 +5537,7 @@ msgstr "Kon_fidentziala"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -5656,11 +5730,10 @@ msgstr "Hasiera-data"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Laburpena"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr "kolorea"
@@ -5687,7 +5760,7 @@ msgstr "I"
 msgid "S"
 msgstr "H"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5722,10 +5795,10 @@ msgstr "Ez"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ezezaguna"
@@ -5738,102 +5811,108 @@ msgstr "Errepikatua"
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Ireki"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Postaren ezarpenak..."
@@ -5925,7 +6004,7 @@ msgid "Alarms"
 msgstr "Alarmak"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5983,26 +6062,26 @@ msgstr "%02i minutu-zatiketa"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6193,7 +6272,7 @@ msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
@@ -6655,12 +6734,12 @@ msgstr "_Lehentasuna:"
 msgid "Web Page:"
 msgstr "Orrialdea"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Egin klik zeregina gehitzeko"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6668,7 +6747,7 @@ msgid ""
 msgstr "Errorea %s abiaraztean"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6676,43 +6755,53 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Errorea %s abiaraztean"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Kargatu iru_diak"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Kargatu iru_diak"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Hitzordurik ez"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "'%s' irekitzen"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6834,16 +6923,16 @@ msgstr "Libre/okupatuta informazioa (%s - %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6851,7 +6940,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6859,12 +6948,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7053,49 +7142,49 @@ msgstr "Hautatutako hilabetea (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Zeregina"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontaktuak "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
@@ -7104,39 +7193,39 @@ msgstr "Prestatu inprimaketa"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Z_ereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Z_ereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7198,22 +7287,22 @@ msgstr "Egutegi-mezua"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Oroigarria"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Egutegi-mezua"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7222,7 +7311,7 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Egutegia"
@@ -8891,7 +8980,7 @@ msgstr "Ezin da mezua ireki"
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
@@ -8980,7 +9069,7 @@ msgstr "Mezuak %s(e)n kopiatzen"
 msgid "Filtering new message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8988,47 +9077,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
 
-#: camel/camel-gpg-context.c:814
-#, fuzzy
-msgid "No data provided"
-msgstr "Ez da fitxategi-izenik eman."
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9036,35 +9120,35 @@ msgid ""
 "%s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9072,28 +9156,28 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Enkriptatutako mezua"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Ezin da mezua editoretik berreskuratu"
@@ -9208,22 +9292,35 @@ msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 msgid "parse error"
 msgstr "Beste errore bat"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Karpeta birtualen posta-hornitzailea"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Ezin izan da %s kargatu: Moduluak kargatzea ez da onartzen sistema honetan."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ezin izan da %s kargatu: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ezin izan da %s kargatu: Moduluak ez du hasieratze-koderik."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Ez dago hornitzailerik `%s' protokolorako"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimoa"
@@ -9377,7 +9474,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -9520,20 +9617,7 @@ msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Karpeta birtualen posta-hornitzailea"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Ez dago hornitzailerik `%s' protokolorako"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9603,21 +9687,25 @@ msgstr "Zerbitzaria: %s, Mota: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Ezin da karpeta hartu: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9852,22 +9940,32 @@ msgstr "%s mezurik ez dago %s(e)n"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 "Ezin izan zaio izena aldatu karpetari: %s: ez dago horrelako karpetarik"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Zakarrontzi-karpeta honetatik ezin duzu mezurik kopiatu."
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Zakarrontzi-karpeta honetatik ezin duzu mezurik kopiatu."
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9884,16 +9982,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Helbide-liburua"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9913,70 +10006,68 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Pasahitza"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Lehenetsi"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Lainobera itxia"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Zerbitzariaren erantzuna lasterregi amaitu da."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
@@ -9991,7 +10082,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
@@ -10000,12 +10091,12 @@ msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10021,25 +10112,25 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -10097,27 +10188,37 @@ msgstr "Izena"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Karpeta guztietan begiratu mezurik dagoen"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Karpeta guztietan begiratu mezurik dagoen"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s zerbitzua %s(e)rako %s(e)n"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10126,69 +10227,69 @@ msgstr "%s zerbitzua %s(e)rako %s(e)n"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10199,24 +10300,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Ezin da karpeta hartu: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
@@ -10238,7 +10347,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
@@ -10321,8 +10430,8 @@ msgstr ""
 "Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10334,55 +10443,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ezin izan da laburpena gorde: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
@@ -10400,53 +10509,44 @@ msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ezin izan da `%s' karpeta ireki:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' karpeta ez dago."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' ez da maildir direktorioa."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10470,9 +10570,9 @@ msgid "Checking for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
@@ -10516,161 +10616,139 @@ msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Ezin izan da `%s' fitxategia ireki:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Ezin da izen horretako karpetarik sortu"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Ezin izan da %s direktorioa sortu:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Ezin izan da `%s' fitxategia sortu:\n"
+"Ezin izan da `%s' karpeta ezabatu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ez da fitxategi erregularra."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Ezin izan da `%s' karpeta ezabatu:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Ezin da izen horretako karpetarik sortu"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ezin izan da karpeta ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Posta-analizatzailearen ezinbesteko errorea %2$s karpetako %1$ld posiziotik "
 "gertu"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ezin da karpeta egiaztatu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ezin izan da fitxategia ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sinkronizatu arren, laburpena eta karpeta ez datoz bat"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errorea aldi baterako postontzian idaztean: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
@@ -10684,10 +10762,17 @@ msgstr "MH mezua eranstea bertan behera utzi da"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' ez da direktorioa."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Ezin da karpeta hartu: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10709,6 +10794,29 @@ msgstr "%s gordetze-erroa ez da direktorio erregularra"
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' karpetarik ez dago."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Ezin izan da `%s' karpeta ireki:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "`%s' karpeta ez dago."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
@@ -10943,47 +11051,47 @@ msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Karpeta ez dago: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Ezin izan da taldea hartu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Ezin izan da mezua eskuratu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komandoak huts egin du: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mezu berrien bila eskaneatzen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Zerbitzari-erantzun ezezaguna: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Utzi bertan behera"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
@@ -11030,7 +11138,7 @@ msgstr "Ezabatu %s egunen ondoren"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11122,7 +11230,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11175,7 +11283,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta-banaketa sendmail programaren bidez"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11348,7 +11456,7 @@ msgstr "SMTP posta-banaketa %s bidez"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
@@ -11456,34 +11564,34 @@ msgstr "AUTH eskaera denboraz kanpo: %s"
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
@@ -11608,20 +11716,20 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategi bat"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "Ezin da mezua enkriptatu: ez dago testu soilik enkriptatzeko"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11630,30 +11738,30 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11662,7 +11770,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11671,7 +11779,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11680,7 +11788,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11689,7 +11797,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11698,7 +11806,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11709,44 +11817,44 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11754,7 +11862,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11765,7 +11873,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11773,7 +11881,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12131,7 +12239,7 @@ msgstr "Orduan"
 msgid "You must specify a folder."
 msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
@@ -12146,20 +12254,20 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Garrantzitsua"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
 msgstr "geroago"
@@ -12253,7 +12361,7 @@ msgstr ""
 "Mezuaren data zuk hemen zehazten duzun orduarekin\n"
 "konparatuko da."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Karpeta birtualak"
 
@@ -12269,7 +12377,7 @@ msgstr "lehenago"
 msgid "months"
 msgstr "hilabete "
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segundo "
 
@@ -12443,7 +12551,7 @@ msgstr "ez da Banderaduna"
 msgid "Junk Test"
 msgstr "ekaina"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12558,9 +12666,10 @@ msgstr "honela hasten da"
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Gaia"
 
@@ -12569,25 +12678,25 @@ msgstr "Gaia"
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Arauak"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Gehitu araua"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Arau-izena: "
@@ -12628,15 +12737,15 @@ msgstr "gaiak hau dauka"
 msgid "Subject does not contain"
 msgstr "gaiak ez dauka hau"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Karpeta birtualari izena eman behar diozu."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "Karpeta birtualen iturburuak"
@@ -12695,9 +12804,9 @@ msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
 msgid "Evolution Mail preferences control"
 msgstr "Evolution-en postaren laneko laburpenaren osagaia."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Posta"
 
@@ -12706,7 +12815,7 @@ msgstr "Posta"
 msgid "Mail Accounts"
 msgstr "Kontuak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Egutegi-hobespenak"
@@ -12751,17 +12860,17 @@ msgstr "Zehaztu fitxategi-izena:"
 msgid "[script]"
 msgstr "Azalpenik ez"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Hizkuntza"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 #, fuzzy
 msgid "Add script signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Sinadura-fitxategia:"
@@ -12850,7 +12959,6 @@ msgid "Unread messages"
 msgstr "Hurrengo irakurri gabeko mezua"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
@@ -12859,411 +12967,430 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Create New Folder"
 msgstr "Sortu _karpeta berria...."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Karpeta-izena:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Ezabatu '%s' karpeta"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ezabatu \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr ""
+"Ezin izan zaio izena aldatu karpetari: %s: ez dago horrelako karpetarik"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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 "I_kusi"
 
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ireki leiho berrian"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Eraman"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Kar_peta berria"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Lehenetsi"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik zeregina gehitzeko"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Bat datozenak:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Esleitua"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
+"Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Gehitu irizpidea"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Etenda"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Enkriptatutako mezua"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP enkriptatzea"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Enkriptatutako mezua"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "A_tzeratutako zereginak:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Ezkutatu"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
@@ -13307,29 +13434,34 @@ msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 msgid "Formatting message"
 msgstr "Mezuak eramaten"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Nork"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
@@ -13344,8 +13476,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13363,21 +13495,26 @@ msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Onartzen ez den eskema"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Huts egin du ziurtagiriak egiaztatzean."
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13389,60 +13526,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mezu izengabea"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Bidali _mezua zerrendara..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Gehitu helbide-liburua"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
@@ -13492,20 +13629,20 @@ msgstr "Iragazkiak"
 msgid "-------- Forwarded Message --------"
 msgstr "Birbidalitako mezua"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13514,7 +13651,7 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13523,32 +13660,38 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Mezua"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gorde mezua honela..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Helbi_dea:"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mezu-bidaltzailea: %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13561,7 +13704,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13589,321 +13732,329 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Ebaki hautatutako mezuak"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Ebaki hautatutako mezuak"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Birbidaltzeko estilo lehenetsia: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Ebaki hautatutako mezuak"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Ebaki hautatutako mezuak"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Birbidaltzeko estilo lehenetsia: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Erakutsi/ezkutatu karpeta-barra "
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Bidali mezua geroago"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Kontuak"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Iragazki-ekintzen egunkaria:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Erakutsi ordua honela"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Erakutsi ordua honela"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Au_rrebistako panela"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Jatorrizko kontaktua:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13911,176 +14062,173 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Hari bateko mezuen zerrenda"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Hari bateko mezuen zerrenda"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Aldakorra"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Inportatu"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Elm importer"
 msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Evolution-en mezu-prestatzailea."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution-en mezu-prestatzailea."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Elm posta zaharra inportatzen ari da Evolution"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Inportatzen..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Itxaron"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s inportatzen %s gisa."
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s eskaneatzen"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Fitxategiak inportatzen"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -14088,16 +14236,44 @@ msgstr ""
 "Evolution-ek Elm posta-fitxategiak aurkitu ditu\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Ezabatu karpeta hau"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Inportatzen"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Fitxategiak inportatzen"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "%s eskaneatzen"
+
+#: mail/importers/netscape-importer.c:72
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Lehentasuna: %s"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14112,7 +14288,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14120,7 +14296,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14129,33 +14305,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/netscape-importer.c:1995
+#: mail/importers/netscape-importer.c:1677
 #, fuzzy
-msgid "Scanning mail filters"
-msgstr "%s posta-fitxategi lokala"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Direktorioa eskaneatzen"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Inportatzen hasten"
+msgid "Importing Netscape data"
+msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editatu iragazkiak"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14163,11 +14331,20 @@ msgstr ""
 "Evolution-ek Netscape posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Pine-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Fitxategiak inportatzen"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Helbide-liburua"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14175,7 +14352,7 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14219,20 +14396,20 @@ msgid "You have not filled in all of the required information."
 msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
@@ -14285,29 +14462,44 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Prestatu mezua"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Karpeta birtual berria"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Editatu iragazkiak"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Sortu karpeta berria"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitatea"
 
@@ -14356,7 +14548,7 @@ msgstr ""
 "bazaude, galdetu\n"
 "sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
@@ -14386,128 +14578,124 @@ msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "%d kontua"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Gehitu irizpidea"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Beti bidali Cc kopia honi:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Itxi"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Gaurko zereginen kolorea"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Mezuak prestatzen"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14524,338 +14712,334 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Lehentasun lehenetsia:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Helb. el.ak hau dauka"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "_Helbide elektronikoa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "honela amaitzen da"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Aukerak"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietateak"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Goiburukoa"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Aipuak nabarmentzeko erabili "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Barnean"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gorde eta itxi"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "mezuak hau dauka"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Erantzun honi:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Segurtasuna"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segurua (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ezin izan da sinatu: \"%s\"(r)en ziurtagiria ez da aurkitu."
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -14866,200 +15050,200 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Egin bip mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML sinadura:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Gaitu"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML postan"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "ekaina"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Erantzun denei"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Ezabatu..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Erakutsi ordua honela"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Jatorrizko kontaktua:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Erabili konexio segurua (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
@@ -15082,7 +15266,7 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Lanean"
 
@@ -15094,128 +15278,128 @@ msgstr "Karpeta iragazten"
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s inportatzen %s gisa."
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15224,7 +15408,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15233,11 +15417,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15246,22 +15430,22 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15296,39 +15480,39 @@ msgstr "Salbuespenak"
 msgid "Security Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Zain..."
 
@@ -15440,20 +15624,20 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
@@ -15799,101 +15983,20 @@ msgstr "Karpeta bereziak"
 msgid "Autocompletion Folders"
 msgstr "Egite-data"
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Ezin da karpeta egiaztatu: %s: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"Ezin izan da karpetaren izena aldatu:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Karpeta bat ezin da bere buruaren gainera eraman."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Karpeta bat ezin da bere buruaren gainean kopiatu."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Adierazi zein karpetatan kopiatu nahi duzun \"%s\" karpeta:"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Kopiatu karpeta"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Adierazi zein karpetatara eraman nahi duzun \"%s\" karpeta:"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Eraman karpeta"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Ezin da karpeta ezabatu:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Ezabatu '%s' karpeta"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Ezin izan da karpetaren izena aldatu:\n"
+"Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Ezin izan da karpetaren izena aldatu:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Ezin da sortu adierazitako karpeta:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(izengabea)"
@@ -16035,7 +16138,7 @@ msgstr "Huts egin du mezua deskodetzean."
 msgid "_Import"
 msgstr "Inportatu"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Konexioak ixten..."
 
@@ -16079,6 +16182,10 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Inportatzen hasten"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16191,130 +16298,6 @@ msgstr "Ez da aurkitu konfigurazioko datu-basea"
 msgid "Generic error"
 msgstr "Errore generikoa"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Sortu lasterbide-talde berria"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Taldearen izena:"
-
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Ziur zaude `%s' taldea kendu\n"
-"nahi duzula lasterbide-barratik?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Aldatu lasterbide-taldearen izena"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Jarri hautatutako lasterbide-taldeari izen hau:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Ikono txikiak"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Erakutsi lasterbideak ikono txiki gisa"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Ikono _handiak"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Erakutsi lasterbideak ikono handi gisa"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "_Talde berria..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Sortu lasterbide-talde berria"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Kendu talde hau..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Kendu lasterbide-talde hau"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Aldatu izena talde honi..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Aldatu izena lasterbide-taldeari"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Ezkutatu lasterbide-barra"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Ezkutatu lasterbide-barra"
-
-#: shell/e-shortcuts-view.c:288
-#, fuzzy
-msgid "Create _Default Shortcuts"
-msgstr "Sortu lasterbide berria"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "Create Default Shortcuts"
-msgstr "Sortu lasterbide berria"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Aldatu izena lasterbideari"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Jarri hautatutako lasterbideari izen hau:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Ireki lasterbide honekin estekatutako karpeta"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Ireki _leiho berrian"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Ireki leiho berrian lasterbide honekin estekatutako karpeta"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Aldatu izena lasterbide honi"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Kendu"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Kendu lasterbide hau lasterbide-barratik"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Errorea lasterbideak gordetzean."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Lasterbideak"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -16326,11 +16309,6 @@ msgstr "Chico"
 msgid "New"
 msgstr "Berria"
 
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Ireki honekin: %s..."
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16643,50 +16621,50 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Hautatu karpeta"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Lanean"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Adierazpena"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "_Helbide elektronikoa:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Idatzi %s(r)en pasahitza"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
@@ -16695,7 +16673,7 @@ msgstr ""
 "Jaulkitzailea: %s\n"
 "Gaia: %s"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -16764,7 +16742,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Ziurtagiri-IDa:"
@@ -16839,11 +16817,11 @@ msgstr "Erakundea"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16891,242 +16869,242 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " °C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "I"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "Ados"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "I"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "jn."
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Gako publikoa: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Gaia: %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ez dago informaziorik"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "eranskina"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Ipar Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Adierazpena"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s - %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sinadura-fitxategia:"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Txertatu"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Gaia: %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sinadura-fitxategia:"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Ziurtagiri-IDa:"
@@ -17743,7 +17721,7 @@ msgstr "_Hariko mezuen zerrenda"
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "A_dd Sender to Addressbook"
+msgid "A_dd Sender to Address Book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17753,7 +17731,7 @@ msgstr "Aplikatu iragazkiak"
 
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
-msgid "Add Sender to Addressbook"
+msgid "Add Sender to Address Book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18218,10 +18196,6 @@ msgstr "For_matua"
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Ireki"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Ireki fitxategia"
@@ -18601,22 +18575,6 @@ msgstr "_Bidali / Jaso"
 msgid "_Window"
 msgstr "Bilatu orain"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Inprimatu laburpena"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Inprimatu laburpena"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Berritu"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Berritu ikuspegia"
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -18692,8 +18650,8 @@ msgstr "Kategoria hau dutenak"
 msgid "_Tasks"
 msgstr "_Zeregina"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18948,25 +18906,25 @@ msgstr "_Bilatu"
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 #, fuzzy
 msgid "Text"
 msgstr "Proba"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Bilatu orain"
@@ -18981,6 +18939,218 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Helbide-liburuaren iturburuak"
+
+#, fuzzy
+#~ msgid "No data provided"
+#~ msgstr "Ez da fitxategi-izenik eman."
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da `%s' fitxategia ireki:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da %s direktorioa sortu:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da `%s' fitxategia sortu:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' ez da direktorioa."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "%s inportatzen %s gisa."
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "%s posta-fitxategi lokala"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Direktorioa eskaneatzen"
+
+#, fuzzy
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Ezin da karpeta egiaztatu: %s: %s"
+
+#, fuzzy
+#~ msgid "Cannot move folder: %s"
+#~ msgstr ""
+#~ "Ezin izan da karpetaren izena aldatu:\n"
+#~ "%s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Karpeta bat ezin da bere buruaren gainera eraman."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Karpeta bat ezin da bere buruaren gainean kopiatu."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Adierazi zein karpetatan kopiatu nahi duzun \"%s\" karpeta:"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Kopiatu karpeta"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Adierazi zein karpetatara eraman nahi duzun \"%s\" karpeta:"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Eraman karpeta"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin da karpeta ezabatu:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Ezabatu '%s' karpeta"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da karpetaren izena aldatu:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da karpetaren izena aldatu:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Sortu lasterbide-talde berria"
+
+#~ msgid "Group name:"
+#~ msgstr "Taldearen izena:"
+
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Ziur zaude `%s' taldea kendu\n"
+#~ "nahi duzula lasterbide-barratik?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Aldatu lasterbide-taldearen izena"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Jarri hautatutako lasterbide-taldeari izen hau:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Ikono txikiak"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Erakutsi lasterbideak ikono txiki gisa"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Ikono _handiak"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Erakutsi lasterbideak ikono handi gisa"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "_Talde berria..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Sortu lasterbide-talde berria"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Kendu talde hau..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Kendu lasterbide-talde hau"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Aldatu izena talde honi..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Aldatu izena lasterbide-taldeari"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Ezkutatu lasterbide-barra"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Ezkutatu lasterbide-barra"
+
+#, fuzzy
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Sortu lasterbide berria"
+
+#, fuzzy
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Sortu lasterbide berria"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Aldatu izena lasterbideari"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Jarri hautatutako lasterbideari izen hau:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Ireki lasterbide honekin estekatutako karpeta"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Ireki _leiho berrian"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Ireki leiho berrian lasterbide honekin estekatutako karpeta"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Aldatu izena lasterbide honi"
+
+#~ msgid "Re_move"
+#~ msgstr "_Kendu"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Kendu lasterbide hau lasterbide-barratik"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Errorea lasterbideak gordetzean."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Lasterbideak"
+
+#, fuzzy
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "Ireki honekin: %s..."
+
+#~ msgid "Print Summary"
+#~ msgstr "Inprimatu laburpena"
+
+#~ msgid "Print summary"
+#~ msgstr "Inprimatu laburpena"
+
+#~ msgid "Reload"
+#~ msgstr "Berritu"
+
+#~ msgid "Reload the view"
+#~ msgstr "Berritu ikuspegia"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopiatu karpeta honetan..."
 
@@ -19603,21 +19773,9 @@ msgstr "%s (%%%d osatuta)"
 #~ msgstr "Beste helbide bat"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolution-en Inportatzeko laguntzailea"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Evolution-en Inportatzeko laguntzailea"
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolution-en mezu-prestatzailea."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolution-en mezu-prestatzailea."
-
 #~ msgid "Searching..."
 #~ msgstr "Bilatzen..."
 
@@ -27626,10 +27784,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Appointments"
 #~ msgstr "Hitzorduak"
 
-#, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Hitzordurik ez"
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %B %d"
 
@@ -28136,9 +28290,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Moderate mist"
 #~ msgstr "Lainobera moderatua"
 
-#~ msgid "Thick mist"
-#~ msgstr "Lainobera itxia"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Lainobera oso itxia"
 
@@ -28671,9 +28822,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Sortu karpeta berria"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Ezabatu karpeta hau"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Bistaratu beste karpeta bat"
 
diff --git a/po/fa.po b/po/fa.po
index b0257b6ebe..f7a51dfa16 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -48,8 +48,7 @@ msgstr ""
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr ""
 
@@ -89,19 +88,20 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
+msgstr "نشانی"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -109,65 +109,65 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr ""
 
@@ -180,39 +180,41 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "شخصی"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -220,7 +222,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -228,64 +230,68 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+msgid "The URI that the address book will display"
+msgstr ""
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -329,7 +335,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -361,19 +367,21 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
-msgstr ""
+#, fuzzy
+msgid "Address Book Properties"
+msgstr "نشانی"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr ""
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "نشانی"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "همیشه"
 
@@ -383,55 +391,56 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "عمومی"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "هرگز"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -441,30 +450,30 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "یک"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -475,7 +484,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -484,7 +493,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -492,38 +501,39 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -532,7 +542,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -540,7 +550,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -550,50 +560,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -601,28 +612,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "ا_ستفاده از SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "استفاده از نشانی پست الکترونیکی"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -630,19 +641,19 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -651,39 +662,39 @@ msgstr ""
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "شماره‌ی _درگاه:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "کارت‌ها"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr ""
 
@@ -798,7 +809,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr ""
 
@@ -887,10 +898,10 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -938,15 +949,15 @@ msgid "_Web page address:"
 msgstr "نشانی صفحه‌ی _وب:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "نشانی"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1930,156 +1941,168 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "پیغام _بعدی"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "منبع"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "تغییر نام"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "منزل"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "کاری"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "کتاب منبع"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "کتاب مقصد"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "نام حساب"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "کاری"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+msgid "GroupWise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "نام _کامل:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr ""
 
@@ -2237,11 +2260,11 @@ msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2326,13 +2349,13 @@ msgid "Email begins with"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
@@ -2349,101 +2372,101 @@ msgid "Type"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
-msgstr ""
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2452,8 +2475,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
 
@@ -2496,7 +2519,7 @@ msgid "Company Phone"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr ""
 
@@ -2555,7 +2578,7 @@ msgid "Nickname"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr ""
 
@@ -2564,7 +2587,7 @@ msgid "Office"
 msgstr "دفتر"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "سازمان"
 
@@ -2682,63 +2705,68 @@ msgstr ""
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "اعضای فهرست"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "کاری"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "شخصی"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "عنوان شغل"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "صفحه‌ی آغازه"
 
@@ -2747,8 +2775,8 @@ msgid "Success"
 msgstr "موفقیت"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2778,7 +2806,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2798,8 +2826,9 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
-msgstr ""
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "نشانی"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -2928,8 +2957,9 @@ msgid "Add address to existing contact \"%s\""
 msgstr ""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "نشانی"
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -2983,17 +3013,37 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr ""
 
@@ -3085,7 +3135,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr ""
 
@@ -3261,8 +3311,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr ""
 
@@ -3339,10 +3389,9 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr ""
 
@@ -3386,26 +3435,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3414,12 +3461,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3427,7 +3474,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3438,19 +3485,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3586,24 +3633,29 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr ""
 
@@ -3630,7 +3682,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
 
@@ -3652,70 +3704,70 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "_تقویم"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3847,7 +3899,7 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -3920,7 +3972,7 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr ""
 
@@ -3931,7 +3983,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr ""
 
@@ -3982,7 +4034,7 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4007,7 +4059,7 @@ msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr ""
 
@@ -4150,7 +4202,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr ""
 
@@ -4239,7 +4291,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
@@ -4383,23 +4435,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4435,8 +4487,8 @@ msgstr ""
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr ""
 
@@ -4462,10 +4514,21 @@ msgstr ""
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, c-format
+msgid "Select destination %s"
 msgstr ""
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "تقویم:"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "تاجیکستان"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4568,7 +4631,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr ""
 
@@ -4592,23 +4655,31 @@ msgstr ""
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
@@ -4684,29 +4755,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4891,7 +4962,7 @@ msgstr ""
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr ""
 
@@ -4925,7 +4996,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr ""
 
@@ -4964,7 +5035,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -4988,7 +5059,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5001,7 +5072,7 @@ msgstr ""
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr ""
 
@@ -5014,7 +5085,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr ""
 
@@ -5033,7 +5104,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr ""
 
@@ -5074,16 +5145,16 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5094,7 +5165,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr ""
 
@@ -5281,11 +5352,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr ""
 
@@ -5310,7 +5380,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr ""
 
@@ -5342,10 +5412,10 @@ msgstr ""
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr ""
@@ -5358,99 +5428,105 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
@@ -5537,7 +5613,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr ""
 
@@ -5592,26 +5668,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr ""
@@ -5792,7 +5868,7 @@ msgid "Send Latest Information"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
@@ -6245,12 +6321,12 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6258,7 +6334,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6266,40 +6342,50 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1763
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6417,16 +6503,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6434,7 +6520,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6442,12 +6528,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6636,49 +6722,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr ""
 
@@ -6687,36 +6773,36 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6769,25 +6855,25 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -8443,7 +8529,7 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr ""
 
@@ -8524,7 +8610,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8532,45 +8618,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8578,58 +8660,58 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr ""
 
@@ -8739,21 +8821,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr ""
@@ -8892,7 +8987,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9023,20 +9118,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9097,21 +9179,25 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr ""
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr ""
@@ -9319,21 +9405,29 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
+#: camel/camel-vtrash-folder.c:44
+msgid "Cannot copy messages to the Trash folder"
+msgstr ""
+
+#: camel/camel-vtrash-folder.c:46
+msgid "Cannot copy messages to the Junk folder"
+msgstr ""
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9349,15 +9443,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "نشانی"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr ""
@@ -9376,68 +9465,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr ""
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "فهرست"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9452,7 +9539,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9461,12 +9548,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9480,25 +9567,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9553,27 +9640,35 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9582,64 +9677,64 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9647,24 +9742,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9685,7 +9788,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr ""
@@ -9763,8 +9866,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9776,55 +9879,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9842,49 +9945,44 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
 #, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
+msgid "Cannot get folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
 #, c-format
-msgid "Folder `%s' does not exist."
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
+msgid "Cannot create folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:134
 #, c-format
-msgid "`%s' is not a maildir directory."
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -9906,9 +10004,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr ""
@@ -9950,148 +10048,132 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10105,9 +10187,14 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-mh-store.c:217
+#, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+
 #: camel/providers/local/camel-mh-store.c:229
 #, c-format
-msgid "`%s' is not a directory."
+msgid "Cannot get folder `%s': not a directory."
 msgstr ""
 
 #: camel/providers/local/camel-mh-summary.c:244
@@ -10130,6 +10217,25 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10350,46 +10456,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10436,7 +10542,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -10516,7 +10622,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -10568,7 +10674,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr ""
 
@@ -10731,7 +10837,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -10837,34 +10943,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -10978,82 +11084,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11061,49 +11167,49 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11111,13 +11217,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11453,7 +11559,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr ""
@@ -11466,19 +11572,19 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr ""
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11560,7 +11666,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11576,7 +11682,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr ""
 
@@ -11745,7 +11851,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -11852,9 +11958,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
 
@@ -11862,25 +11969,25 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -11920,15 +12027,15 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr ""
 
@@ -11977,9 +12084,9 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr ""
 
@@ -11987,7 +12094,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12025,15 +12132,15 @@ msgstr ""
 msgid "[script]"
 msgstr ""
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12106,7 +12213,6 @@ msgid "Unread messages"
 msgstr ""
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12114,373 +12220,389 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr ""
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, c-format
+msgid "Cannot delete local %s folder."
+msgstr ""
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, c-format
+msgid "Cannot rename local %s folder."
+msgstr ""
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr ""
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
@@ -12523,29 +12645,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -12559,8 +12686,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 ""
 
@@ -12577,19 +12704,23 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+msgid "Error verifying signature"
+msgstr ""
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12601,56 +12732,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr ""
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12695,53 +12826,59 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr ""
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "اضافه کردن نشانی"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "_پیغام‌ها"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12750,7 +12887,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -12771,293 +12908,299 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
-msgid "Default forward style"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:12
-msgid "Default height of the Message Window"
+msgid "Default forward style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:13
-msgid "Default reply style"
+msgid "Default height of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:14
-msgid "Default width of the Message Window"
+msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Enable/disable caret mode"
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Height of the message-list pane"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Height of the message-list pane."
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13065,182 +13208,203 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/importers/elm-importer.c:244
+msgid "Importing Elm data"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr ""
-
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+msgid "Destination folder:"
+msgstr ""
+
+#: mail/importers/evolution-mbox-importer.c:119
+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
+#, c-format
+msgid "Importing `%s'"
+msgstr ""
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+msgid "Importing mailbox"
+msgstr ""
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13255,7 +13419,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13263,7 +13427,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13272,47 +13436,47 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
+#: mail/importers/netscape-importer.c:1677
+msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+msgid "Importing Pine data"
+msgstr ""
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr ""
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr ""
 
@@ -13352,19 +13516,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -13413,27 +13577,41 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+msgid "New Mail Folder"
+msgstr ""
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "_پوشه"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "ایجاد پنجره‌ی جدید"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13468,7 +13646,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -13490,118 +13668,114 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13611,476 +13785,472 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14099,7 +14269,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr ""
 
@@ -14111,168 +14281,168 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14304,38 +14474,38 @@ msgstr ""
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr ""
 
@@ -14435,20 +14605,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr ""
 
@@ -14759,89 +14929,18 @@ msgstr ""
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
@@ -14964,7 +15063,7 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15002,6 +15101,10 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15106,123 +15209,6 @@ msgstr ""
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15233,11 +15219,6 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15489,52 +15470,52 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "نشانی پست الکترونیکی"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr ""
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15595,7 +15576,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr ""
 
@@ -15660,11 +15641,11 @@ msgstr "واحد سازمانی (وس)"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -15709,209 +15690,209 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr ""
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr ""
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
@@ -16498,16 +16479,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "نشانی"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "نشانی"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -16951,10 +16934,6 @@ msgstr ""
 msgid "HT_ML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr ""
@@ -17315,22 +17294,6 @@ msgstr ""
 msgid "_Window"
 msgstr "_پنجره"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr ""
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17391,8 +17354,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr ""
 
@@ -17630,23 +17593,23 @@ msgstr ""
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "متن"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 8905445824..4a75e2e38b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-22 21:49+0200\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
 "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"
 
 #: addressbook/conduit/address-conduit.c:272
@@ -46,10 +46,9 @@ msgstr "Määrittele automaatinen täydennys tästä"
 #. 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:362
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
@@ -89,19 +88,19 @@ msgstr "Evolution kansioiden asetusten määrittely"
 msgid "Manager your S/Mime certificates here"
 msgstr "Hallitse S/Mime varmenteitasi täältä"
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, 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-component.c:270
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -109,65 +108,65 @@ msgstr "Uusi osoitekirja"
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Yhdistäminen LDAP-palvelimeen epäonnistui"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kirjautuminen LDAP-palvelimelle epäonnistui"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Kyselyä Juuri-DSE:lle ei voitu suorittaa"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Palvelin ei palauttanut tuettuja hakupohjia"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tämä palvelin ei tue LDAPv3 skeemooja"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Virhe haettaessa skeeman tietoja"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Palvelin ei vastannut kelvollisella skeematiedolla"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Siirretään..."
 
@@ -184,26 +183,24 @@ msgstr ""
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirretään  '%s'"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
@@ -360,7 +357,7 @@ msgstr " Tar_kista tuetut kannat "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -404,7 +401,7 @@ msgid "Address Book Sources"
 msgstr "Osoitekirjojen lähteet"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Aina"
 
@@ -467,7 +464,7 @@ msgid "Group:"
 msgstr "Ryhmä:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Ei koskaan"
 
@@ -719,7 +716,7 @@ msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Milloin mahdollista"
 
@@ -747,7 +744,7 @@ msgstr "_Haun rajoitus:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -903,7 +900,7 @@ msgstr "Yhteistyö"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
@@ -997,10 +994,10 @@ msgstr "Ry_hmät..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2194
-#: mail/em-folder-view.c:773 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1048,15 +1045,15 @@ msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Osoite"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2040,102 +2037,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL pikaviestin"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2852
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Palvelu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Sijainti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2542
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Koti"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Työ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2543
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Muutettu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Tilin nimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1461
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Luokkien muokkain ei ole käytettävissä."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1469
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Tämä yhteystieto kuuluu näihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1692
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Tallenna yhteystieto VCardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2143,7 +2149,7 @@ msgstr ""
 "Haluatko varmasti\n"
 "poistaa nämä yhteystiedot?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2151,46 +2157,51 @@ msgstr ""
 "Haluatko varmasti\n"
 "poistaa tämän yhteystiedon?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2541
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Työ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2851
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2853
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2854
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3142
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "Sähköposti:"
 
@@ -2439,13 +2450,13 @@ msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Luokka on"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
@@ -2466,94 +2477,93 @@ msgstr "Tyyppi"
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Tallenna VCardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Uusi yhteystieto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Uusi yhteystietoluettelo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "_Tuo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Etsi yhteystietoja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Address Book Sources..."
 msgstr "Osoitekirjan lähteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "_Pilotin asetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Välitä yhteystieto eteenpäin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Tulosta kuori"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Copy to Address Book..."
 msgstr "Kopioi osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 msgid "Move to Address Book..."
 msgstr "Siirrä osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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 "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
 #: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Nykyinen näkymä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2566,8 +2576,8 @@ msgstr ""
 "uudestaan"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -2610,7 +2620,7 @@ msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -2669,7 +2679,7 @@ msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Huomio"
 
@@ -2678,7 +2688,7 @@ msgid "Office"
 msgstr "Asema"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -2804,61 +2814,67 @@ msgstr "Valittu"
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr "(kartta)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr "kartta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr "työ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Ryhmä"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr "Puhelin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr "henkilökohtainen"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Kotisivu"
 
@@ -2867,8 +2883,8 @@ msgid "Success"
 msgstr "Onnistui"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3093,17 +3109,17 @@ msgstr "Korttinäkymä"
 msgid "GTK Tree View"
 msgstr "GTK puunäkymä"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Uudelleenvirtauksen testi"
 
-#: 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 "Tekijänoikeudet (C) 2000, Ximin, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Tämä testaa reflow canvas:ia"
 
@@ -3132,12 +3148,12 @@ msgstr "VCard (.vcf, .gcrd)"
 msgid "Print envelope"
 msgstr "Tulosta kirjekuori"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
@@ -3229,7 +3245,7 @@ msgstr "Reunukset"
 msgid "Number of columns:"
 msgstr "Sarakkeiden määrä:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Asetukset"
 
@@ -3408,8 +3424,8 @@ msgstr "Tiedostonimeä ei annettu."
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Syötä salasana"
 
@@ -3486,7 +3502,7 @@ 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:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3744,23 +3760,30 @@ msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa"
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Kuvaus sisältää"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalenteri"
 
@@ -3788,12 +3811,8 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3815,71 +3834,71 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "_Kalenteri"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, 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:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
@@ -4011,7 +4030,7 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Toimenpide/Liipasin"
 
@@ -4083,7 +4102,7 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -4094,7 +4113,7 @@ msgstr "tapaamisen alku"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Käytä"
 
@@ -4144,7 +4163,7 @@ msgstr "30 minuuttia"
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Hälytykset"
 
@@ -4169,7 +4188,7 @@ msgid "Days"
 msgstr "Päivää"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Kä_ytä"
 
@@ -4309,7 +4328,7 @@ msgid "_Fri"
 msgstr "_Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Yleistä"
 
@@ -4622,7 +4641,7 @@ msgid "No summary"
 msgstr "Ei kuvausta"
 
 #: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1144
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
@@ -4789,23 +4808,32 @@ msgstr "Ajoitus"
 msgid "Meeting"
 msgstr "Kokous"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Eräpäivä on ennen aloituspäivää!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenterin '%s' ei voitu avata"
@@ -4879,36 +4907,31 @@ msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
 #. 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:591 composer/e-msg-composer.c:2082
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:782
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Valtuuta..."
 
@@ -5094,7 +5117,7 @@ msgstr "  "
 msgid "occurrences"
 msgstr "tapahtumiskerrat"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Päiväys/Aika"
 
@@ -5127,7 +5150,7 @@ msgid "_No recurrence"
 msgstr "_Ei toistuvuutta"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -5169,7 +5192,7 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1561
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
@@ -5193,7 +5216,7 @@ msgstr "Tehtävän toimeksinto on luotu. Lähetetäänkö se?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Tehtävän toimeksiantoa on muutettu. Lähetetäänkö päivitetty versio?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Valmistumispäivä on väärin"
 
@@ -5277,16 +5300,16 @@ msgstr "Yleistä"
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Eräpäivä on ennen aloituspäivää!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
@@ -5297,7 +5320,7 @@ msgstr "_Luottamuksellinen"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -5484,7 +5507,7 @@ msgstr "Aloituspäivä"
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "väri "
 
@@ -5544,10 +5567,10 @@ msgstr "Ei"
 #: 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:1673 camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -5589,7 +5612,7 @@ msgstr "Uusi tehtävä"
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "T_ulosta..."
 
@@ -5616,13 +5639,13 @@ msgstr "_Julkaise vapaa/varattu-tietoja"
 
 #: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
 #: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:748 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Avaa"
 
 #: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:750 mail/em-popup.c:689 mail/em-popup.c:804
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
@@ -5636,7 +5659,7 @@ msgstr "L_eikkaa"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2187 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5745,7 +5768,7 @@ msgid "Alarms"
 msgstr "Hälytykset"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5774,20 +5797,12 @@ msgid "URL"
 msgstr "URL:"
 
 #. 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"
@@ -5811,33 +5826,26 @@ msgstr "%02.i minuutin välein"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6019,7 +6027,7 @@ msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
@@ -6382,10 +6390,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-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
@@ -6394,10 +6398,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:1606
 msgid "%m/%d/%Y"
@@ -6481,12 +6481,12 @@ msgstr "Prioriteetti:"
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2180
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Näpäytä avataksesi %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6496,7 +6496,7 @@ msgstr ""
 "%s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1949
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6507,12 +6507,12 @@ msgstr ""
 "%s\n"
 "on kaatunut."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6521,38 +6521,38 @@ msgstr ""
 "Virhe avattaessa %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Valtuutetaan seuraavat tehtävät...."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1763
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: calendar/gui/gnome-cal.c:1808
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: calendar/gui/gnome-cal.c:1957
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6563,7 +6563,7 @@ msgstr ""
 "%s\n"
 "on kaatunut."
 
-#: calendar/gui/gnome-cal.c:2812
+#: calendar/gui/gnome-cal.c:2799
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -6673,16 +6673,16 @@ msgstr "Vapaa/varattu-tiedot (%s - %s)"
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Syötä salasana %s:lle"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6694,7 +6694,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution konvertoi kansioitas..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6706,12 +6706,12 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution konvertoi kansioitasi..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Verkossa"
 
@@ -8723,7 +8723,7 @@ msgstr "Viestiä ei voida avata"
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
@@ -8836,9 +8836,9 @@ msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
 "käyttäjälle: \"%s\""
 
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1271
-#: camel/camel-gpg-context.c:1430 camel/camel-gpg-context.c:1516
-#: camel/camel-gpg-context.c:1623 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Peruutettu."
 
@@ -8852,15 +8852,11 @@ msgstr ""
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltä: %s"
 
-#: camel/camel-gpg-context.c:815
-msgid "No data provided"
-msgstr "Tietoa ei annettu"
-
-#: camel/camel-gpg-context.c:855
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epäonnistui: kelvollisia vastaanottajia ei ole määritelty"
 
-#: camel/camel-gpg-context.c:1132
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8871,60 +8867,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1137
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s salaus GnuPG:llä epäonnistui: %s\n"
 
-#: camel/camel-gpg-context.c:1250 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1264 camel/camel-gpg-context.c:1672
-#: camel/camel-gpg-context.c:1723
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg:n suoritus epäonnistui: %s"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1422
-#: camel/camel-gpg-context.c:1509 camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1616 camel/camel-gpg-context.c:1640
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1745
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "gpg:n suoritus epäonnistui."
 
-#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Digitaalisesti allekirjoitettu viestin osa"
 
-#: camel/camel-gpg-context.c:1389 camel/camel-gpg-context.c:1398
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Viestin allekirjoitusta ei voida tarkistaa: virheellinen viestin muoto"
 
-#: camel/camel-gpg-context.c:1405
+#: camel/camel-gpg-context.c:1397
 #, 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:1492
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: camel/camel-gpg-context.c:1647 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Salattu sisältö"
 
-#: camel/camel-gpg-context.c:1651
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Viestin sisältöä ei voitu tulkita"
 
@@ -9226,7 +9222,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
@@ -9443,11 +9439,11 @@ msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Roskakori"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Roskapostia"
@@ -9695,6 +9691,16 @@ msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Et voi kopioida viestejä NNTP-kansiosta"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9711,7 +9717,7 @@ msgstr ""
 "Käytä suodattimia uusille viesteille saapuvien kansiossa tällä palvelimella"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Synkronoi sähköposti etäpalvelimelta automaattisesti"
 
@@ -9732,42 +9738,40 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise-palvelinten käyttöä varten"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Salasana"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1579 mail/em-folder-view.c:1617
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Oletukset"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "lista"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2876
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Toiminto keskeytetty"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2879
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9776,26 +9780,26 @@ msgstr ""
 "Hälytys IMAP-palvelimelta %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Palvelimen vastaus päättyi liian äkkiä."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP-palvelimen vaste ei sisältänyt tietoja %s:stä"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
@@ -9810,7 +9814,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kansio oli tuhottu ja uudelleenluotu palvelimella"
 
@@ -9819,12 +9823,12 @@ msgstr "Kansio oli tuhottu ja uudelleenluotu palvelimella"
 msgid "Scanning for changed messages"
 msgstr "Etsitään muuttuneita viestejä"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Viestin haku epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9840,25 +9844,25 @@ msgstr ""
 "Viestiä ei voida hakea: %s\n"
 " %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Haetaan yhteenvedon tietoja uusista viesteistä"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Viestin runkoa ei löytynyt FETCH-vastauksesta"
 
@@ -9914,27 +9918,37 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Käytä suodattimia uusille viesteille saapuvien kansiossa tällä palvelimella"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Etsi uusia viestejä kaikista kansioista"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Etsi uusia viestejä kaikista kansioista"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9943,65 +9957,65 @@ msgstr "IMAP-palvelin %s:lle palvelimella %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10012,13 +10026,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10026,18 +10040,18 @@ msgstr "Kansioita %s ei ole olemassa"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ylempi kansio ei voi sisältää alikansioita"
 
@@ -10063,7 +10077,7 @@ msgstr ""
 "\n"
 "ÄLÄ KÄYTÄ TÄTÄ OIKEAN SÄHKÖPOSTIN KÄSITTELYYN!!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Yhdistäminen POP-palvelimeen epäonnistui %s"
@@ -10262,7 +10276,7 @@ msgstr "Kansion `%s' poistaminen epäonnistui: %s"
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: camel/providers/local/camel-maildir-store.c:382
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10284,9 +10298,9 @@ msgid "Checking for new messages"
 msgstr "Etsitään uusia viestejä"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Tallennetaan kansiota"
@@ -10389,75 +10403,75 @@ msgstr "%s:n uudelleennimeäminen epäonnistui: %s: %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kansiota ei voitu avata: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Vakava sähköpostin käsittelyvirhe kohdassa %ld kansiossa %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion tarkistus ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tiedostoa ei voitu avata: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Väliaikaista sähköpostilaatikkoa ei voida avata: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Lähdekansiota %s ei voitu sulkea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Väliaikaista kansiota ei voitu sulkea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2149
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kansiota ei voitu uudelleen nimetä: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Yhteenveto ja kansio eivät täsmää edes virkistyksen jälkeen"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kansiota ei voitu tallentaa: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Virhe kirjoitettaessa väliaikaiseen postikansioon: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Väliaikaiseen postikansioon kirjoitus epäonnistui: %s: %s"
@@ -10844,7 +10858,7 @@ msgstr "Poista %s:n päivän kuluttua"
 msgid "Disable support for all POP3 extensions"
 msgstr "Poista käytöstä tuki POP3 laajennoksille"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10933,7 +10947,7 @@ msgid "No such folder `%s'."
 msgstr "Kansiota '%s' ei ole olemassa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10987,7 +11001,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sähköpostin lähetys ohjelman sendmail avulla"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11158,7 +11172,7 @@ msgstr "SMTP postinvälitys %s:n kautta"
 msgid "Cannot send message: sender address not valid."
 msgstr "Viestiä ei voida lähettää: lähettäjän osoite on epäkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
@@ -11266,34 +11280,34 @@ msgstr "QUIT-kyselyn aikakatkaisu: %s"
 msgid "QUIT response error"
 msgstr "Virhe QUIT-vastauksessa"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
@@ -11434,30 +11448,30 @@ msgstr ""
 "Tiedoston %s lukeminen epäonnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1170 composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voida hakea muokkaimelta"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11466,7 +11480,7 @@ msgstr ""
 "Tiedostossa siirtyminen epäonnistui: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11475,7 +11489,7 @@ msgstr ""
 "Tiedoston tiivistäminen epäonnistui: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11484,7 +11498,7 @@ msgstr ""
 "Tiedostokuvaajan kopiointi epäonnistui: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11493,7 +11507,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1392
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11501,7 +11515,7 @@ msgstr ""
 "Ximian Evolution on löytänyt tallentamattomia tiedostoja edellisestä \n"
 "istunnosta. Haluatko yrittää niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11512,43 +11526,43 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1598
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Allekirjoitus:"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: composer/e-msg-composer.c:2261
+#: composer/e-msg-composer.c:2263
 #, 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:2290
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Piilota _liitepalkki (tiputa liitteitä tähän)"
 
-#: composer/e-msg-composer.c:2293 composer/e-msg-composer.c:3169
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Näytä _liitepalkki (tiputa liitteitä tähän)"
 
-#: composer/e-msg-composer.c:2310 composer/e-msg-composer.c:3051
-#: composer/e-msg-composer.c:3052
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:3081
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11556,7 +11570,7 @@ msgstr ""
 "Viestin kirjoitusikkunaan ei voitu luoda:\n"
 "Osoitteen valintakontrollia ei voitu aktivoida."
 
-#: composer/e-msg-composer.c:3110
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11568,7 +11582,7 @@ msgstr ""
 "Varmista, että oikea versio ohjelmista gtkhtml ja libgtkhtml\n"
 "on asennettu.\n"
 
-#: composer/e-msg-composer.c:3214
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11576,7 +11590,7 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen epäonnistui:\n"
 "HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:4235
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11736,16 +11750,12 @@ msgstr "Synkronointiryhmät:"
 
 #. 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"
@@ -11797,31 +11807,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -11957,19 +11959,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Tärkeä"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Tehtävää"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Myöhemmin"
 
@@ -12073,7 +12075,7 @@ msgstr "sitten"
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -12242,7 +12244,7 @@ msgstr "ei ole merkitty"
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:781
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Otsikko"
@@ -12348,9 +12350,10 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr "Lopeta käsittely"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1079
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Aihe"
 
@@ -12486,7 +12489,7 @@ msgstr "Sähköposti"
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
@@ -12524,15 +12527,15 @@ msgstr "Määrittele kelvollinen komentotiedoston nimi."
 msgid "[script]"
 msgstr "[komentotiedosto]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: mail/em-composer-prefs.c:900
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Lisää allekirjoituskomentotiedosto"
 
-#: mail/em-composer-prefs.c:920
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
@@ -12624,276 +12627,283 @@ msgstr "<Valitse kansio näpäyttämällä tästä>"
 msgid "Create New Folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1907
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "vKansiot"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: mail/em-folder-tree.c:1754
+#: mail/em-folder-tree.c:1798
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kansiota '%s' ei voida siirtää: virheellinen toiminto"
 
-#: mail/em-folder-tree.c:1783 mail/em-folder-tree.c:1872
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1799 mail/em-folder-tree.c:1812
-#: mail/em-folder-view.c:658 mail/em-folder-view.c:672
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: mail/em-folder-tree.c:1907
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-tree.c:2026
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kansiota ei voitu poistaa: %s"
 
-#: mail/em-folder-tree.c:2051
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Paikallisen '%s' kansion poistaminen ei onnistu."
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Poistetaanko todella kansio \"%s\" ja kaikki sen alikansiot?"
 
-#: mail/em-folder-tree.c:2067
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Poista \"%s\""
 
-#: mail/em-folder-tree.c:2101
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Paikallista %s kansiota ei voida nimetä uudelleen."
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä '%s' uudelleen: "
 
-#: mail/em-folder-tree.c:2112
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: mail/em-folder-tree.c:2136
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Kansio nimeltään \"%s\" on jo olemassa. Valitse toinen nimi."
 
-#: mail/em-folder-tree.c:2182 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2183
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: mail/em-folder-tree.c:2188
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Siirrä"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2192
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: mail/em-folder-tree.c:2195
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Nimeä uudestaan"
 
-#: mail/em-folder-tree.c:2198 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:749 mail/em-popup.c:688
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: mail/em-folder-view.c:751
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/em-folder-view.c:754 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:808
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:809
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:811
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "_Vastine...."
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Merkitse _roskapostiksi"
 
-#: mail/em-folder-view.c:770 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Merkitse _ei-roskapostiksi"
 
-#: mail/em-folder-view.c:774
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/em-folder-view.c:777
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/em-folder-view.c:778 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Toteuta _suodattimet"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VKansio _aiheen perusteella"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VKansio _lähettäjän perusteella"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VKansio _vastaanottajien perusteella"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VKansio _listan perusteella"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "vKansio säikeen perusteella"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "_Suodata säikeen perusteella"
 
-#: mail/em-folder-view.c:1653
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Oletukset"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/em-folder-view.c:1913
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: mail/em-folder-view.c:2175
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Näpäytä lähettääksesi %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12901,11 +12911,11 @@ 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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12913,11 +12923,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12925,11 +12935,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12937,11 +12947,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12949,11 +12959,11 @@ 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:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12963,11 +12973,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaanviestin sisällön "
 "käytännöllisen lyhyessä ajassa."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12975,11 +12985,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12989,31 +12999,31 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: mail/em-format-html-display.c:974
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:982
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: mail/em-format-html-display.c:985
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: mail/em-format-html-display.c:1056
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Piilota"
 
@@ -13061,29 +13071,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Lähettäjä"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Piilokopiot"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Postittaja"
 
@@ -13097,8 +13112,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13115,15 +13130,20 @@ msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
@@ -13143,22 +13163,22 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "POP3-tunnusten välimuistin siirto epäonnistui: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Kansioiden laajennuksen tilan siirto epäonnistui: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Hakemiston '%s' luonti epäonnistui: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Taltion '%s' avaaminen epäonnistui: %s"
@@ -13284,12 +13304,18 @@ msgstr "Tallenna viesti..."
 msgid "Add address"
 msgstr "Lisää osoite"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Viesti %s:ltä"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/em-utils.c:2406
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13302,7 +13328,7 @@ msgstr ""
 "\n"
 "Poistetaanko viestit todella?"
 
-#: mail/em-utils.c:2432
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13327,94 +13353,90 @@ msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Etsi roskapostia saapuvista viesteistä IMAP-tunnuksilla"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Lainauksen korostusväri"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Lainauksen korostuksene käytetty väri."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Viestinkirjoitusikkunan oletuskorkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Viestinkirjoitusikkunan oletusleveys"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Viestinkirjoitusikkunan oletuskorkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Viestinkirjoitusikkunan oletusleveys"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Viesti-ikkunan oletusleveys"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Viestilistapaneelin korkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Viestilistapaneelin korkeus."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13424,15 +13446,15 @@ msgstr ""
 "voidaan käyttää mitä tahansa Gnomen MIME-tyyppientietokannassa määriteltyä "
 "bonobo-komponentin katselinta viestin näyttämiseen."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Etiketit ja niihin liittyvät värit"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Lista tileistä"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13441,11 +13463,11 @@ msgstr ""
 "merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:29
 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:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13454,15 +13476,15 @@ msgstr ""
 "väri pareja, jossa väri on määäritelty HTML-värien heksadesimaalisessa "
 "muodossa."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:31
 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:33
+#: mail/evolution-mail.schemas.in.in.h:32
 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:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13472,82 +13494,82 @@ 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Viestiikkunan oletuskorkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Viestiikkunan oletusleveys"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 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:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Uudesta postista huomauttava äänitiedosto"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Uutta postia-huomuksen tyyppi"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 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:50
+#: mail/evolution-mail.schemas.in.in.h:49
 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:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä poistaa poistettuja"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 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:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13555,102 +13577,94 @@ 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:54
+#: mail/evolution-mail.schemas.in.in.h:53
 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:55
+#: mail/evolution-mail.schemas.in.in.h:54
 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:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 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:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Suorita roskapostitarkistus saapuvalle postille"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Suorita roskapostitarkistus saapovalle sähköpostille IMAP-tileillä (käypä "
-"ainoastaan, jos tarkista_saapuvat on tosi)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "Salainen optio."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "Salainen optio."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Lähetä HTML-postia oletuksena."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestilistassa."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestilistalla"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Näytä \"Esikatselu\"-paneeli"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Näytä esikatselupaneeli"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Äänitiedosto joka soitetaan, kun uusia viestejä saapuu."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Määrittelee saapuneiden viestien huomautuksen, jota käyttäjä haluaa käyttää."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Päätekirjasin viestien näyttöön"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Vaihtelevan levyinen kirjasin viestien näyttöön"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13661,99 +13675,99 @@ msgstr ""
 "otsakkeita ja sen, näytetäänkö niitä. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - määrittele enabled, jos otsake halutaan näyttää postinäkymässä."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Säikeistä viestilista"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Säikeistä viestilista"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestilista aiheen perusteella"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Käytä Spamassassin palvelinta ja asiakasta"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Käytä Spamassassin palvelinta ja asiakasta (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Käytä omia kirjasimia"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Käytä omia kirjasimia viestien näyttöön"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia (ei DNS:ää)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen kirjasin"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Näytä/Bcc on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Näytä/Bcc on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Näytä/Cc on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Näytä/Cc on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Näytä/Lähettäjä on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Näytä/Lähettäjä on valittu."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Näytä/Lähetä ryhmään on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Näytä/Lähetä ryhmään on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Näytä/Vastausosoite on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Näytä/Vastausosoite on valittu"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13761,11 +13775,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "Portti, jossa käyttäjän spamd-palvelinta ajetaan"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "Spamd:n portti"
 
@@ -13802,15 +13816,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution tuo vanhoja Elm-sähköpostejasi"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Tuodaan..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
@@ -13831,22 +13845,22 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
@@ -14000,19 +14014,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Polku:"
 
@@ -14064,28 +14078,43 @@ msgstr ""
 "     '%s'\n"
 "ja on päivitetty."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 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-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Lähetä viesti"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Uusi vKansio"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Suodattimet"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Luo uusi kalenteri"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI sähköpostilähteelle,  jonka näkymä näyttää"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identiteetti"
 
@@ -14129,7 +14158,7 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
@@ -14156,118 +14185,114 @@ msgid "Connecting to server..."
 msgstr "Yhdistetään palvelimeen..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr " "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "Tar_kista tuetut tyypit"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL ei ole tuettu tässä Evolutionin käännöksessä)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL ei ole tuettu tässä Evolutionin käännöksessä)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Näytettävät sähköpostin otsakkeet</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Salaa myös itselleni lähetettäessä salattua sähköpostia"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Lisää _skripti"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Lisää uusi allekirjoitus..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Salaa _aina myös itselle, kun lähetetään salattua sähköpostia"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Liitä alkuperäinen viesti"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balttilainen (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balttilainen (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Värit"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Tarkista _saapuva viestit"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Kirjoita viesti"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14283,279 +14308,275 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi näpäyttämällä nappia \"Toteuta\""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Oletukset"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Oletusmerkistö:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Poistetaan viestiä"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Allekirjoita digitaalisesti lähtevät viestit (oletuksena)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "_Älä tarkista saapuvia viestejä IMAP-tileiltä"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Älä lainaa alkuperäistä viestiä"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook yhteensopivuus)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Luonnoskansio:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Sähköpostitilit"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Sähköposti_osoite:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Suorita komento..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Tasalevyinen:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Suodatinten asetukset"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nä"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Otsakkeet:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Korosta lainaukset värillä"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Sisäkkäisesti"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Nimikkeet ja värit"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Ladataan kuvia"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Sähköpostiasetukset"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Viestin muokkain"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Viestin näyttö"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Viestin kirjasimet"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Huomautus uudesta sähköpostista"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Huomio: salasanaa ei kysytä ennen kuin otat ensimmäistä kertaa yhteyttä"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc vastaanottajia on määritelty"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Tulostettavat kirjasimet"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Lainaa alkuperäinen viesti"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sähköpostia"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Vastaanoton _asetukset"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Muista tämä _salasana"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Palauta oletukset"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Turvallisuus"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Valite HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Lähetetään sähköpostia"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Lähetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Oikoluku"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Normaali Unix-postilaatikko"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14565,7 +14586,7 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14575,7 +14596,7 @@ msgstr ""
 "olevista kielistä riippuu ainoastaan siitä, mille kielille sinulla "
 "onsanastoja asennettuna."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14583,15 +14604,15 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Käytä _daemonia"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14601,173 +14622,173 @@ msgstr ""
 "\n"
 "Näpäytä \"Eteenpäin\" aloittaaksesi."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Todennustapa:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Todennustapa:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Lisää hymiöt kuvina automaattisesti"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Piippaa kun uutta sähköpostia saapuu"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Varmista poistettujen lopullinen poisto kansiosta"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Oletusallekirjoitus:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Käytä"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Salaa lähtevät viestit oletuksena"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_Lähetä HTML-postia"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identiteetti"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Lataa kuvat, jos lähettäjä on osoitekirjassa"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Vain _paikalliset testit"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Älä koskaan lataa kuvia verkosta"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Soita äänitiedosto uuden sähköpostin saapuessa"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Kysy vahvistus, kun lähetetään HTML-viestejä yhteystiedoille, jotka eivät "
 "niitä halua"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus, kun lähetetään viestejä tyhjälle Aihe-otsakkella"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Tuleva posti"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Palauta oletukset"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Komentotiedosto:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Valitse..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Lähetetään viestejä"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Näytä animoidut kuvat"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_allekirjoitukset"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Oletuskirjaisin:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Päätekirjaisin:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Käytä salattua yhteyttä (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "kuvaus"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
@@ -14802,12 +14823,12 @@ msgstr "Suodatetaan kansiota"
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14816,116 +14837,116 @@ msgstr ""
 "Lisäys '%s':ään epäonnnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Virhe viestin %d %d:stä kohdalla"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14934,7 +14955,7 @@ msgstr ""
 "Tulostiedoston luonti epäonnistui: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14943,11 +14964,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14956,22 +14977,22 @@ msgstr ""
 "Tulostiedostoa ei voida luoda: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voitu kirjoittaa: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudelleen yhteyttää %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Muutetaan roskapostitilaa"
 
@@ -15003,38 +15024,38 @@ msgstr "Salaus"
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Palvelin: %s, tyyppi: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Polku: %s, tyyppi: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tyyppi: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
@@ -16113,7 +16134,7 @@ msgstr "Sähköpostiosoite"
 msgid "Certificate Viewer: %s"
 msgstr "Varmenteen katselin: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Syötä salasana '%s':lle"
@@ -17914,22 +17935,6 @@ msgstr "_Lähetä / Vastaanota"
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Tulosta yhteenveto"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Tulosta yhteenveto"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Lataa uudestaan"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Lataa näkymä uudelleen"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Yrityksen mukaan"
@@ -17990,8 +17995,8 @@ msgstr "_Ryhmän mukaan"
 msgid "_Tasks"
 msgstr "_Tehtävät"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18234,23 +18239,23 @@ msgstr "_Etsi"
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Alikohteen ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Teksti"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "_Etsi nyt"
 
@@ -18264,6 +18269,37 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmiina)"
 
+#~ msgid "No data provided"
+#~ msgstr "Tietoa ei annettu"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Etsi roskapostia saapuvista viesteistä IMAP-tunnuksilla"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Suorita roskapostitarkistus saapovalle sähköpostille IMAP-tileillä (käypä "
+#~ "ainoastaan, jos tarkista_saapuvat on tosi)"
+
+#~ msgid "    "
+#~ msgstr " "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "_Älä tarkista saapuvia viestejä IMAP-tileiltä"
+
+#~ msgid "Print Summary"
+#~ msgstr "Tulosta yhteenveto"
+
+#~ msgid "Print summary"
+#~ msgstr "Tulosta yhteenveto"
+
+#~ msgid "Reload"
+#~ msgstr "Lataa uudestaan"
+
+#~ msgid "Reload the view"
+#~ msgstr "Lataa näkymä uudelleen"
+
 #~ msgid "Addressbook Sources"
 #~ msgstr "Osoitekirjalähteet"
 
diff --git a/po/fr.po b/po/fr.po
index 05207f0413..d642b104da 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,14 +15,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-19 02:22+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-19 02:11+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: addressbook/conduit/address-conduit.c:272
@@ -55,10 +55,9 @@ msgstr "Configurez ici la compilation automatique"
 #. 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:362
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -98,21 +97,21 @@ msgstr "Composant de configuration des paramètres dossier d'Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Gérer votre certificats S/Mime ici"
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, 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-component.c:270
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -120,66 +119,66 @@ msgstr "Nouveau carnet d'adresses"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Créer un nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Créer une nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "La connexion au serveur LDAP a échoué"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "L'authentification sur le serveur LDAP a échoué"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 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:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 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:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migration..."
 
@@ -196,26 +195,24 @@ msgstr ""
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:173
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personnel"
 
@@ -232,7 +229,7 @@ msgstr "Serveurs LDAP"
 msgid "Autocompletion Settings"
 msgstr "Paramètres de complétion automatique"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -245,7 +242,7 @@ msgstr ""
 "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/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -258,23 +255,23 @@ msgstr ""
 "temps dans les préférences du serveur d'annuaires de ce carnet \n"
 "d'adresses."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Cette requête ne s'est pas terminée correctement."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -282,7 +279,7 @@ 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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -290,7 +287,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -300,7 +297,7 @@ msgstr ""
 "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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -308,27 +305,32 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses."
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "l'UID de la source des contatcs que la vue affichera"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "L'URI que le calendrier affichera."
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList xml pour les listes de complétion d'uris"
@@ -375,7 +377,7 @@ msgstr "  Affic_her les bases dupportées"
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -419,7 +421,7 @@ msgid "Address Book Sources"
 msgstr "Sources du carnet d'adresses..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Toujours"
 
@@ -480,7 +482,7 @@ msgid "Group:"
 msgstr "Groupe :"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Jamais"
 
@@ -739,7 +741,7 @@ msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
@@ -767,7 +769,7 @@ msgstr "Limite de _téléchargement :"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -923,7 +925,7 @@ msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1017,10 +1019,10 @@ msgstr "Ca_tégories..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2194
-#: mail/em-folder-view.c:773 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1068,15 +1070,15 @@ msgid "_Web page address:"
 msgstr "Adresse de la page _Web :"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2060,102 +2062,111 @@ msgid "AOL Instant Messenger"
 msgstr "Messagerie instantanée AOL"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2853
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2856
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Service"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Emplacement"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2543
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Domicile"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Travail"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2544
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Livre source"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Modifié"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nom du compte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Éditeur de catégorie non disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1470
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories :"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1693
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2163,7 +2174,7 @@ msgstr ""
 "Êtes-vous sûr de vouloir \n"
 "supprimer ces contacts ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2171,47 +2182,52 @@ msgstr ""
 "Êtes-vous sûr de vouloir \n"
 "supprimer ce contact ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2542
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2852
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2854
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3143
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
 #
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Éditer entièrement"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Nom complet :"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "_Courrier électronique :"
 
@@ -2463,13 +2479,13 @@ msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Tout champ contient"
 
@@ -2490,94 +2506,93 @@ msgstr "Type"
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Nouveau contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nouvelle liste de contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Aller au Dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Rechercher des contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Address Book Sources..."
 msgstr "Sources du carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Envoyer un message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Copy to Address Book..."
 msgstr "Copier dans le carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 msgid "Move to Address Book..."
 msgstr "Déplacer dans le carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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 "Copier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
 #: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Vue courante"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2590,8 +2605,8 @@ msgstr ""
 "l'utiliser de nouveau."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Toute catégorie"
 
@@ -2634,7 +2649,7 @@ 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:438 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Courrier électronique"
 
@@ -2693,7 +2708,7 @@ msgid "Nickname"
 msgstr "Surnom"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Note"
 
@@ -2702,7 +2717,7 @@ msgid "Office"
 msgstr "Bureau"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2828,61 +2843,67 @@ msgstr "Sélectionné"
 msgid "Has Cursor"
 msgstr "A le curseur"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr "(carte)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr "carte"
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Membres de la liste"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "Courrier électronique"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr "travail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Groupe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr "Vidéo conférence"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr "Téléphone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr "personnel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr "Web"
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Fonction"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Site internet"
 
@@ -2891,8 +2912,8 @@ msgid "Success"
 msgstr "Succès"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3117,17 +3138,17 @@ msgstr "Vue carte"
 msgid "GTK Tree View"
 msgstr "Affichage de l'arborescence GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test de reformatage"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Ceci devrait tester l'élément de reformatage du canvas"
 
@@ -3156,12 +3177,12 @@ msgstr "VCard (.vcf, .gcrd)"
 msgid "Print envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Imprimer les contacts"
 
@@ -3253,7 +3274,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Options"
 
@@ -3435,8 +3456,8 @@ msgstr "Aucun nom de fichier spécifié"
 msgid "Unnamed List"
 msgstr "Liste de contacts sans nom"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
 
@@ -3515,7 +3536,7 @@ 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:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3777,23 +3798,30 @@ msgstr "Afficher l'heure en format 24h au lieu d'utiliser am/pm"
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La description contient"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "La description contient"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Différent"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -3823,12 +3851,8 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3850,73 +3874,73 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Créer un nouveau rendez-vous"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Créer une nouvelle demande de réunion"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous sur une journée entière"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Créer un nouveau rendez-vous journée entière"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "C_alendrier"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Créer un nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, 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:705
+#: calendar/gui/calendar-component.c:945
 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 "
@@ -4050,7 +4074,7 @@ msgstr "heures"
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Action/Activation"
 
@@ -4122,7 +4146,7 @@ msgid "hour(s)"
 msgstr "heure(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4133,7 +4157,7 @@ msgstr "Début du rendez-vous"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Activé"
 
@@ -4183,7 +4207,7 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alertes"
 
@@ -4208,7 +4232,7 @@ msgid "Days"
 msgstr "Jours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_ctiver"
 
@@ -4348,7 +4372,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Général"
 
@@ -4674,7 +4698,7 @@ msgid "No summary"
 msgstr "Aucun résumé"
 
 #: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1144
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
@@ -4848,23 +4872,32 @@ msgstr "Planification"
 msgid "Meeting"
 msgstr "Réunion"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "La date d'échéance est avant la date de début !"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "La date de fin est erronée."
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "L'heure de début est erronée."
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
@@ -4938,36 +4971,31 @@ msgid "_Start time:"
 msgstr "Heure de _début :"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2082
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:782
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Déléguer à..."
 
@@ -5161,7 +5189,7 @@ msgstr "le"
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Date/Heure"
 
@@ -5194,7 +5222,7 @@ msgid "_No recurrence"
 msgstr "_Aucune récurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Enlever"
 
@@ -5236,7 +5264,7 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1561
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "Aban_donner les modifications"
 
@@ -5262,7 +5290,7 @@ msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Les informations de la tâche ont changé. Envoyer une version mise à jour ?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "La date d'achèvement est erronée."
 
@@ -5346,16 +5374,16 @@ msgstr "Basique"
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée."
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "La date d'échéance est avant la date de début !"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
@@ -5366,7 +5394,7 @@ msgstr "Con_fidentiel"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Description :"
 
@@ -5553,7 +5581,7 @@ msgstr "Date de début"
 msgid "Summary"
 msgstr "Résumé"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "couleur"
 
@@ -5613,10 +5641,10 @@ msgstr "Non"
 #: 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:1673 camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Inconnu"
@@ -5658,7 +5686,7 @@ msgstr "Nouvelle tâche"
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Imprimer..."
 
@@ -5685,13 +5713,13 @@ msgstr "_Publier l'information Libre/Occupé"
 
 #: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
 #: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:748 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ouvrir"
 
 #: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:750 mail/em-popup.c:689 mail/em-popup.c:804
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
@@ -5705,7 +5733,7 @@ msgstr "Co_uper"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2187 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5814,7 +5842,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Terminé"
 
@@ -5843,20 +5871,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5880,33 +5900,26 @@ msgstr "%02i divisions par minute"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6013,6 +6026,7 @@ msgstr "Erreur iCalendar"
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:921
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -6089,7 +6103,7 @@ msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
@@ -6458,10 +6472,6 @@ msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-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
@@ -6470,10 +6480,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:1606
 msgid "%m/%d/%Y"
@@ -6557,12 +6563,12 @@ msgstr "Priorité :"
 msgid "Web Page:"
 msgstr "Site internet :"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2177
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6572,7 +6578,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1949
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6583,12 +6589,12 @@ msgstr ""
 "%s\n"
 "est tombé en panne."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6597,38 +6603,38 @@ msgstr ""
 "Erreur d'ouverture de %s :\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1763
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: calendar/gui/gnome-cal.c:1808
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: calendar/gui/gnome-cal.c:1957
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6639,7 +6645,7 @@ msgstr ""
 "%s\n"
 "est tombé en panne."
 
-#: calendar/gui/gnome-cal.c:2812
+#: calendar/gui/gnome-cal.c:2799
 msgid "Purging"
 msgstr "Purger"
 
@@ -6749,16 +6755,16 @@ msgstr "Information Libre/Occupé (%s à %s)"
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6770,7 +6776,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6782,12 +6788,12 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Sur internet"
 
@@ -8803,7 +8809,7 @@ msgstr "Impossible d'ouvrir le message."
 msgid "Failed on message %d"
 msgstr "Anomalie au message %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
@@ -8916,9 +8922,9 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour\n"
 "débloquer la clé de l'utilisateur : « %s »"
 
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1271
-#: camel/camel-gpg-context.c:1430 camel/camel-gpg-context.c:1516
-#: camel/camel-gpg-context.c:1623 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Annulé."
 
@@ -8932,15 +8938,11 @@ msgstr ""
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Réponse inattendue de GnuPG : %s"
 
-#: camel/camel-gpg-context.c:815
-msgid "No data provided"
-msgstr "Aucune donnée fournie"
-
-#: camel/camel-gpg-context.c:855
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Le chiffrement a échoué : aucun destinataire valide spécifié."
 
-#: camel/camel-gpg-context.c:1132
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8951,34 +8953,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1137
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s a échoué : %s\n"
 
-#: camel/camel-gpg-context.c:1250 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1264 camel/camel-gpg-context.c:1672
-#: camel/camel-gpg-context.c:1723
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "L'exécution de GPG a échoué : %s"
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1422
-#: camel/camel-gpg-context.c:1509 camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1616 camel/camel-gpg-context.c:1640
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1745
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "L'exécution de GPG a échoué."
 
-#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-gpg-context.c:1389 camel/camel-gpg-context.c:1398
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
@@ -8986,27 +8988,27 @@ msgstr ""
 "Impossible de vérifier la signature de ce message : format de message "
 "incorrect"
 
-#: camel/camel-gpg-context.c:1405
+#: camel/camel-gpg-context.c:1397
 #, 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:1492
+#: camel/camel-gpg-context.c:1484
 #, 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:1550
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-gpg-context.c:1647 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Contenu chiffré"
 
-#: camel/camel-gpg-context.c:1651
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Impossible d'analyser le contenu du message"
 
@@ -9120,23 +9122,37 @@ msgstr "Le déchiffrement de la partie MIME a échoué : structure non valide"
 msgid "parse error"
 msgstr "erreur d'analyse"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Fournisseur de dossier de courrier virtuel"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+"Pour la lecture du courrier comme requête sur un autre ensemble de dossiers"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Impossible de charger %s : le chargement du module n'est pas supporté sur ce "
 "système."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Impossible de charger %s : %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossible de charger %s : aucun code d'initialisation dans le module."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Aucun fournisseur disponible pour le protocole « %s »"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonyme"
@@ -9303,7 +9319,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'authentification en provenance du serveur."
 
@@ -9441,21 +9457,7 @@ msgstr "Échec de la résolution de l'hôte : hôte non trouvé"
 msgid "Host lookup failed: unknown reason"
 msgstr "Échec de la résolution de l'hôte : raison inconnue"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Fournisseur de dossier de courrier virtuel"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-"Pour la lecture du courrier comme requête sur un autre ensemble de dossiers"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Aucun fournisseur disponible pour le protocole « %s »"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9532,11 +9534,11 @@ msgstr "Impossible de créer le dossier : opération non valide sur ce stockage
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : opération non valide"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Corbeille"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Spam"
@@ -9785,6 +9787,16 @@ msgstr "Impossible de renommer le dossier : %s : opération non valide"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : dossier inexistant"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Vous ne pouvez copier des message à partir d'un dossier NNTP !"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9802,7 +9814,7 @@ msgstr ""
 "ce serveur"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 "Synchroniser automatiquement les mails locaux à partir des mails distants"
@@ -9824,44 +9836,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Pour accéder aux serveurs Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Mot de passe"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Cette option utilisera un mot de passe en clair pour se connecter au serveur "
 "IMAP."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1579 mail/em-folder-view.c:1617
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Défaut"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "liste"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2876
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2879
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9870,26 +9880,26 @@ msgstr ""
 "Alerte du serveur IMAP %s@%s : \n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Réponse inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "La réponse du serveur s'est terminée trop tôt."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Réponse OK inattendue du serveur IMAP : %s"
@@ -9904,7 +9914,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Le dossier a été détruit et recréé sur le serveur."
 
@@ -9913,12 +9923,12 @@ msgstr "Le dossier a été détruit et recréé sur le serveur."
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Impossible de récupérer le message : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9934,25 +9944,25 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible."
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 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:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Impossible de trouver le corps du message dans la réponse FETCH."
 
@@ -10009,27 +10019,37 @@ msgstr ""
 "Appliquer les filtres aux nouveaux messages dans la boîte de réception sur "
 "ce serveur"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Vérifie les nouveaux messages dans tous les dossiers."
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Vérifie les nouveaux messages dans tous les dossiers."
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Serveur IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Service IMAP pour %s sur %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10038,65 +10058,65 @@ msgstr "Service IMAP pour %s sur %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10107,33 +10127,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Aucun dossier de type « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
-#: camel/providers/local/camel-mbox-store.c:198
+#: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
 #, c-format
 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:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes 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:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Dossier parent inconnu : %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers."
 
@@ -10159,7 +10179,7 @@ msgstr ""
 "\n"
 "!!! NE PAS UTILISER CECI POUR VOTRE COURRIER EN PRODUCTION !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Impossible de se connecter au serveur POP %s"
@@ -10247,7 +10267,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:341
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10285,19 +10305,19 @@ msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer « %s » : %s."
 
 #: camel/providers/local/camel-local-store.c:385
-#: camel/providers/local/camel-mbox-store.c:270
+#: 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-mbox-store.c:282
+#: 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:417
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Impossible de supprimer le meta fichier dossier « %s » : %s"
@@ -10326,22 +10346,22 @@ msgid "Invalid message contents"
 msgstr "Contenu de message non valide"
 
 #: camel/providers/local/camel-maildir-store.c:107
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Impossible d'obtenir le dossier « %s » : %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Impossible d'obtenir le dossier « %s » : le dossier n'existe pas."
 
 #: camel/providers/local/camel-maildir-store.c:119
-#: camel/providers/local/camel-mbox-store.c:170
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Impossible de créer le dossier « %s » : %s"
@@ -10363,7 +10383,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:382
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10385,9 +10405,9 @@ msgid "Checking for new messages"
 msgstr "Recherche de nouveaux messages"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Stockage du dossier"
@@ -10431,16 +10451,21 @@ msgstr "Le dossier semble irrémédiablement corrompu."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erreur construction message : boîte à lettres corrompue ?"
 
-#: camel/providers/local/camel-mbox-store.c:192
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Impossible de créer un dossier avec ce nom."
+
+#: camel/providers/local/camel-mbox-store.c:206
 #, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
 "Impossible d'obtenir le dossier « %s » : il ne s'agit pas d'un fichier "
 "normal."
 
-#: camel/providers/local/camel-mbox-store.c:222
-#: camel/providers/local/camel-mbox-store.c:233
-#: camel/providers/local/camel-mbox-store.c:256
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -10449,120 +10474,116 @@ msgstr ""
 "Impossible de supprimer le dossier « %s » :\n"
 "%s."
 
-#: camel/providers/local/camel-mbox-store.c:241
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "« %s » n'est pas un fichier normal."
 
-#: camel/providers/local/camel-mbox-store.c:248
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Le dossier « %s » n'est pas vide. Non supprimé."
 
-#: camel/providers/local/camel-mbox-store.c:347
-msgid "Cannot create a folder by this name."
-msgstr "Impossible de créer un dossier avec ce nom."
-
-#: camel/providers/local/camel-mbox-store.c:360
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Impossible de créer le répertoire « %s » : %s."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Impossible de créer le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-store.c:376
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Le répertoire existe déjà"
 
-#: camel/providers/local/camel-mbox-store.c:458
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Le nouveau nom du dossier n'est pas valide."
 
-#: camel/providers/local/camel-mbox-store.c:471
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Impossible de renommer « %s » : « %s » : %s"
 
-#: camel/providers/local/camel-mbox-store.c:546
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Impossible de renommer « %s » en %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossible d'ouvrir le dossier : %s : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erreur fatale d'analyse du courrier prés de la position %ld dans le dossier %"
 "s."
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossible de vérifier le dossier : %s : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossible d'ouvrir le fichier : %s : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ompossible d'ouvrir la boîte à lettres temporaire : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %s : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2149
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Le résumé et le dossier ne correspondent pas, même après une synchronisation."
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Impossible de stocker le dossier : %s."
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erreur d'écriture dans la boite à lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Échec d'écriture dans la boite à lettres temporaire : %s : %s"
@@ -10963,7 +10984,7 @@ msgstr "Supprimer après %s jour(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Désactiver le support de toutes les extensions POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11053,7 +11074,7 @@ msgid "No such folder `%s'."
 msgstr "Aucun dossier de type « %s »."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11107,7 +11128,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Distribution du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11279,7 +11300,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossible d'envoyer le message : l'adresse de l'expéditeur n'est pas valide."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Envoi du message"
 
@@ -11386,34 +11407,34 @@ msgstr "Demande QUIT expirée : %s"
 msgid "QUIT response error"
 msgstr "Erreur lors de la réponse QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Supprimer les éléments sélectionnés de la liste des pièces jointes"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Ajouter une pièce jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
@@ -11556,30 +11577,30 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: composer/e-msg-composer.c:1170 composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Impossible de récupérer le message de l'éditeur."
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11588,7 +11609,7 @@ msgstr ""
 "Impossible de rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1270
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11597,7 +11618,7 @@ msgstr ""
 "Impossible de tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11606,7 +11627,7 @@ msgstr ""
 "Impossible de copier le descripteur de fichier : %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11615,7 +11636,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1392
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11624,7 +11645,7 @@ msgstr ""
 "précédente.\n"
 "Voulez-vous essayer de les récupérer ?"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11635,43 +11656,43 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Avertissement : message modifié"
 
-#: composer/e-msg-composer.c:1598
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:2043
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signature :"
 
-#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Généré automatiquement"
 
-#: composer/e-msg-composer.c:2261
+#: composer/e-msg-composer.c:2263
 #, 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:2290
+#: composer/e-msg-composer.c:2292
 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:2293 composer/e-msg-composer.c:3169
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 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:2310 composer/e-msg-composer.c:3051
-#: composer/e-msg-composer.c:3052
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:3081
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11679,7 +11700,7 @@ 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:3110
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11691,7 +11712,7 @@ msgstr ""
 "Veuillez vous assurer que vous avez les bonnes\n"
 "versions de gtkhtml et libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3214
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11699,7 +11720,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "activation du composant « Éditeur HTML » impossible."
 
-#: composer/e-msg-composer.c:4235
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11859,16 +11880,12 @@ msgstr "Synchroniser les catégories"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -11920,31 +11937,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -12065,7 +12074,7 @@ msgstr "Alors"
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
@@ -12080,19 +12089,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Important"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Plus tard"
 
@@ -12180,7 +12189,7 @@ msgstr ""
 "La date du message sera comparée à la date\n"
 "actuellee au moment du filtrage."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Dossiers Virtuels"
 
@@ -12196,7 +12205,7 @@ msgstr "passé(e)s"
 msgid "months"
 msgstr "mois"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "secondes"
 
@@ -12365,7 +12374,7 @@ msgstr "n'est pas marqué"
 msgid "Junk Test"
 msgstr "Test spam"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:781
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Étiquette"
@@ -12473,9 +12482,10 @@ msgstr "Débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1079
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Objet"
 
@@ -12483,25 +12493,25 @@ msgstr "Objet"
 msgid "Unset Status"
 msgstr "Statut non défini"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Le nom de la règle « %s » n'est pas unique. Choisissez-en un autre."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Règles"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Ajouter une règle"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Éditer la règle"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Nom de la règle"
 
@@ -12541,15 +12551,15 @@ msgstr "L'objet contient"
 msgid "Subject does not contain"
 msgstr "L'objet ne contient pas"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Vous devez nommer ce dossier virtuel."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Vous devez spécifier au moins un dossier comme source."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Source du dossier virtuel"
 
@@ -12612,7 +12622,7 @@ msgstr "Courrier"
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
@@ -12650,15 +12660,15 @@ msgstr "Vous devez spécifier un nom de script valide."
 msgid "[script]"
 msgstr " [script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Langues"
 
-#: mail/em-composer-prefs.c:900
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Ajouter une signature script"
 
-#: mail/em-composer-prefs.c:920
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatures"
 
@@ -12751,277 +12761,285 @@ msgstr "<cliquez ici pour sélectionner un dossier>"
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1907
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "CORRESPONDPAS"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 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:1754
+#: mail/em-folder-tree.c:1798
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Impossible de déplacer le dossier « %s » : opération non valide"
 
-#: mail/em-folder-tree.c:1783 mail/em-folder-tree.c:1872
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1799 mail/em-folder-tree.c:1812
-#: mail/em-folder-view.c:658 mail/em-folder-view.c:672
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: mail/em-folder-tree.c:1907
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Créer un dossier"
 
-#: mail/em-folder-tree.c:2026
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Impossible de supprimer le dossier : %s"
 
-#: mail/em-folder-tree.c:2051
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Impossible de supprimer le dossier local « %s »."
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Réellement supprimer le dossier « %s » et tous ses sous-dossiers ?"
 
-#: mail/em-folder-tree.c:2067
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Supprimer « %s »"
 
-#: mail/em-folder-tree.c:2101
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Impossible de renommer le dossier local « %s »."
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: mail/em-folder-tree.c:2112
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: mail/em-folder-tree.c:2136
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
 
-#: mail/em-folder-tree.c:2182 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2183
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: mail/em-folder-tree.c:2188
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Déplacer"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2192
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: mail/em-folder-tree.c:2195
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: mail/em-folder-tree.c:2198 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:749 mail/em-popup.c:688
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Éditer comme nouveau  message..."
 
-#: mail/em-folder-view.c:751
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/em-folder-view.c:754 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:808
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:809
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:811
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme non im_portant"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Marquer comme _spam"
 
-#: mail/em-folder-view.c:770 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _spam"
 
-#: mail/em-folder-view.c:774
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/em-folder-view.c:777
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/em-folder-view.c:778 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur l'_objet"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "Dossier virtuel sur le fil"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur l'_objet"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtre sur le fil"
 
-#: mail/em-folder-view.c:1653
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Défaut"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/em-folder-view.c:1910
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: mail/em-folder-view.c:2172
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer sur le message %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Non signé"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13029,11 +13047,11 @@ msgstr ""
 "Ce message n'est pas signé. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13041,11 +13059,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13053,11 +13071,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:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Signature valide, impossible de vérifier l'expéditeur"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13065,11 +13083,11 @@ 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -13077,11 +13095,11 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être vu lors de son passage "
 "sur internet."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Chiffré, faiblement"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -13091,11 +13109,11 @@ 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13103,11 +13121,11 @@ 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Chiffré, fortement"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -13117,31 +13135,31 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: mail/em-format-html-display.c:974
+#: mail/em-format-html-display.c:973
 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:982
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: mail/em-format-html-display.c:985
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "par %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: mail/em-format-html-display.c:1056
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Masquer"
 
@@ -13188,29 +13206,34 @@ msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
@@ -13224,8 +13247,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13242,15 +13265,20 @@ msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non supporté pour multipart/encrypted"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Format de signature non supporté"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Erreur inconnue de la vérification de signature"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue de la vérification de signature"
 
@@ -13270,22 +13298,22 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution déplace vos dossiers..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, 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:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, 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:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "La création du répertoire « %s » a échoué : %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "L'ouverture du stockage « %s » a échoué : %s"
@@ -13412,13 +13440,19 @@ msgstr "Enregistrer le message..."
 msgid "Add address"
 msgstr "Ajouter adresse"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Courrier de %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossible de créer de répertoire temporaire : %s."
 
 #
-#: mail/em-utils.c:2406
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13433,7 +13467,7 @@ msgstr ""
 "Effacer réellement ces messages ?"
 
 #
-#: mail/em-utils.c:2432
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13459,99 +13493,94 @@ 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 "Check incoming mail being junk for IMAP accounts"
-msgstr ""
-"Vérifier si les messages entrants, pour les comptes IMAP, sont des spams."
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Couleur de surbrillance des citations"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Couler de surbrillance des citations."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Hauteur par défaut de la fenêtre de composition"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Largeur par défaut de la fenêtre de composition"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractère par défaut pour la composition des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractère par défaut pour la composition des messages."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractère par défaut pour l'affichage des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractère par défaut pour l'affichage des messages."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Style de transfert par défaut"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Hauteur par défaut de la fenêtre de composition"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Largeur par défaut de la fenêtre de composition"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Afficher les indicateurs d'erreurs d'orthographe sur les mots que vous "
 "entrez."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vider les dossiers Corbeille en quittant Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13562,15 +13591,15 @@ msgstr ""
 "qui est assigné à une vue de composant bonobo dans la base des types mime "
 "GNOME pouvant être utilisée pour l'affichage du contenu."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Liste des étiquettes et des couleurs qui leur sont associées."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13579,11 +13608,11 @@ 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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 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:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13592,16 +13621,16 @@ msgstr ""
 "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:32
+#: mail/evolution-mail.schemas.in.in.h:31
 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:33
+#: mail/evolution-mail.schemas.in.in.h:32
 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:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13612,84 +13641,84 @@ 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 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:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 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:40
+#: mail/evolution-mail.schemas.in.in.h:39
 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:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 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:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Fichier sonore de notification des nouveaux courriers"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Type de notification des nouveaux courriers"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Demander pour les objets vides"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 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:50
+#: mail/evolution-mail.schemas.in.in.h:49
 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:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Demander si l'utilisateur purge"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13697,107 +13726,99 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:53
 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:55
+#: mail/evolution-mail.schemas.in.in.h:54
 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:56
+#: mail/evolution-mail.schemas.in.in.h:55
 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:57
+#: mail/evolution-mail.schemas.in.in.h:56
 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:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Lancer le test de spam sur les messages entrants"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Lancer le test de spam sur les messages entrant pour les comptes IMAP "
-"(seulement valide si check_incoming est positionnée à vrai)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courrier au format HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courrier au format HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées et animations."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimés (comme barrés) dans la liste des messages."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marqués comme supprimés dans la liste des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Afficher le panneau « Aperçu »"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Afficher le panneau « Précédent »."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Jouer un fichier son lors de l'arrivée de nouveaux messages."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Spécifie le type de notification d'arrivée de courrier que l'utilisateur "
 "désire utiliser."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Les polices de terminal pour l'affichage des mails"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 "Sélection d'une police HTML à largeur variable pour l'afficher des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13809,99 +13830,99 @@ msgstr ""
 "est &lt;header enabled&gt; - activé si l'en-tête est affichée dans la vue du "
 "courrier."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Liste de messages par fil de discussion."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Liste de messages par fil de discussion"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basée sur les sujets"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Délai avant de marquer les messages comme vus"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Délai avant de marquer les messages comme vus."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Chaîne UID pour le compte par défaut."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Utiliser le démon et le client Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Utiliser le démon et le client Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Utiliser des polices personnalisées"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Utiliser des polices personnalisées pour afficher le courrier"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Utiliser seulement des tests de spam locaux."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Utiliser seulement des tests de spam locaux (pas de DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Largeur de polices variable"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "L'élément du menu Affichage/Bcc est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "L'élément du menu Affichage/Bcc est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "L'élément du menu Affichage/Cc est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "L'élément du menu Affichage/Cc est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "L'élément du menu Affichage/De est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "L'élément du menu Affichage/De est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'élément du menu Affichage/Répondre À est coché"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'élément du menu Affichage/Répondre À est coché."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13909,11 +13930,11 @@ msgstr ""
 "Retomber sur le tri par sujets quand les messages ne contiennent pas d'en-"
 "tpete In-Reply-To ou References."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "Port sur lequel démarrer spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "Port pour spamd"
 
@@ -13949,13 +13970,17 @@ msgstr "Outlook Express 4 (.mbx)"
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importe vos anciens courriers Elm"
 
-#: mail/importers/elm-importer.c:89 mail/importers/netscape-importer.c:1220
-#: mail/importers/pine-importer.c:117
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importation..."
 
-#: mail/importers/elm-importer.c:91 mail/importers/netscape-importer.c:1222
-#: mail/importers/pine-importer.c:119
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -13975,15 +14000,28 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/mail-importer.c:134
-msgid "Importing mailbox"
-msgstr "Importation des boîtes à lettres"
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "La destination est en lecture seule"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importation de « %s »"
 
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+msgid "Importing mailbox"
+msgstr "Importation des boîtes à lettres"
+
 #: mail/importers/mail-importer.c:354
 #, c-format
 msgid "Scanning %s"
@@ -14134,19 +14172,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Chemin :"
 
@@ -14198,29 +14236,44 @@ msgstr ""
 "    « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-component.c:466
+#: mail/mail-component.c:487
 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-component.c:525
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: mail/mail-component.c:526
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Composer un nouveau message"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nouveau dossier virtuel"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtres de courrier"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Créer un nouveau calendrier"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "L'URI d'émission du message que la vue affichera"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identité"
 
@@ -14266,7 +14319,7 @@ msgstr ""
 "cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
@@ -14293,119 +14346,115 @@ msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Vérifier les types supportés"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'Evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Afficher les en-têtes des mails</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Éga_lement chiffrer pour moi-même lors de l'envoi de courrier chiffré"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Éditeur de compte"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informations du compte"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Ajouter un sc_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Ajouter une nouvelle signature..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Toujours chiffrer pour moi-même lors de l'envoi de courrier chiffré."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Toujours envoyér une copie cachée (_Bcc) à :"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Faire _toujours confiance aux clés de mon trousseau lors du chiffrement."
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Joindre le message d'origine"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pièce jointe"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Authentification"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balte (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balte (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Jeu de _caractères :"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Couleurs"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "_Vérifier le courrier entrant"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Vérifier l'or_thographe pendant la frappe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Recherche de nouveau courrier"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Vérifier sir les messages entrants sont du spam"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Couleur pour les _mots mal orthographiés :"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Composition des messages"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14420,139 +14469,135 @@ msgstr ""
 "\n"
 "Cliquez sur « Appliquer » pour enregistrer les paramètres."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Dé_faut"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Comportement par défaut"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Codage des caractères par défaut :"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Suppression du courrier"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer numériquement les messages sortants (par défaut)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "_Ne pas vérifier l'arrivée de messages pour les comptes IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Ne pas citer le message d'origine"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de réunion (compatibilité Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Dossier _Brouillons :"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_Adresse électronique :"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Vider les dossiers Corbeille en qui_ttant"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficat de chiffrage :"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Largeur fi_xe :"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Option de filtrage"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Propriétés de la police"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "E_n-tête"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Étiquettes et couleurs"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Emplacement de la boîte à lettres"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Composeur de messages"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Polices pour les messages"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14560,141 +14605,141 @@ msgstr ""
 "Note : vous n'aurez pas à fournir de mot de passe avant votre première "
 "connexion."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informations facultatives"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisation :"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clé PGP/GPG :"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Demander lors de l'envoi de messages où seuls des destinataires BCC sont "
 "définis."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Polices imprimées"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Répertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Cité"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Mémoriser le mot de passe"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Ré_pondre à :"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Options de réception"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Mémoriser ce mot de _passe"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_écurité"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sécurisé (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Sélection d'une police HTML à largeur fixe"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Sélection d'une police HTML à largeur fixe pour l'impression"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Sélection d'une police HTML à largeur variable"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification."
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Cert_ificats de signature :"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Spécifiez le nom du _fichier :"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Correction orthographique"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14704,7 +14749,7 @@ msgstr ""
 "signature. Le nom spécifié ne sera utilisé\n"
 "que pour l'affichage. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14714,7 +14759,7 @@ msgstr ""
 "orthographique ainsi que la langue. La liste ne mentionne que les langues "
 "pour lesquelles un dictionnaire a été installé."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14722,15 +14767,15 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par exemple : « Travail » ou « Personnel »"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Utiliser le _démon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Largeur variable :"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14740,174 +14785,174 @@ msgstr ""
 "\n"
 "Cliquez sur  « Suivant » pour commencer."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "_Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Vérifier automatiquement la présence de nouveaux messages tous les"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Insérer _automatiquement des images de frimousses"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Émettre un _bip lors de l'arrivée de nouveaux messages"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Signature par _défaut :"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Valeurs par _défaut"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ne pas prévenir lors _de l'arrivée de nouveaux messages"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "Activ_er"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Chiffrer les messages sortants (par défaut)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Style de _transfert :"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Courrier _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identité"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Spam"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Charger les images si l'expéditeur est dans le carnet d'adresses"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Tests _locaux uniquement"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par défaut"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Jouer un fichier son lors de l'arrivée de nouveaux messages"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "_pas"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Demander lors de l'envoi de messages dé_pourvu d'objet"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Réception du courrier"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Style de _réponse  :"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script :"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Sélectionner..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Envoi du _courrier"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Afficher le_s images animées"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Police par _défaut :"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Police du _terminal :"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Utiliser une connexion sécurisée (SSL) :"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mêmes polices que dans les autres applications"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "description"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
@@ -14930,7 +14975,7 @@ msgstr ""
 "Erreur durant l'exécution de l'opération :\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Travail en cours"
 
@@ -14942,12 +14987,12 @@ msgstr "Filtrage du dossier"
 msgid "Fetching Mail"
 msgstr "Récupération du courrier"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "L'application des filtres de sortie a échoué : %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14956,116 +15001,116 @@ msgstr ""
 "L'ajout à %s a échoué : %s\n"
 "Ajouté au dossier local « Sent » à la place."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Envoi de « %s »"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d sur %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Le message %d sur %d a échoué"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Terminé."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Messages transférés"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Rafraîchissement du dossier"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Récupération de %d message(s)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Enregistrement de %d message(s)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15074,7 +15119,7 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15083,11 +15128,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15096,22 +15141,22 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Changer l'état du spam"
 
@@ -15143,39 +15188,39 @@ msgstr "Chiffrement"
 msgid "Security Information"
 msgstr "Informations de sécurité"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Annulation..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveur : %s, type : %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Chemin : %s, type : %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Envoyer & recevoir le courrier"
 
 #
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Attente..."
 
@@ -15282,20 +15327,20 @@ msgstr ""
 "        « %s »\n"
 "et ont été mis à jour."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentative d'édition du dossier virtuel « %s » qui n'existe pas."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
@@ -16131,8 +16176,9 @@ msgstr "Ne plus me demander"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution peut importer des données depuis les fichiers suivants :"
 
+#. Preview/Alpha/Beta version warning message
 #: shell/main.c:217
-#, c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
@@ -16258,7 +16304,7 @@ msgstr "Adresse électronique"
 msgid "Certificate Viewer: %s"
 msgstr "Visionneur de certificat : %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Saisissez le mot de passe pour « %s »"
@@ -18065,22 +18111,6 @@ msgstr "_Envoyer / recevoir"
 msgid "_Window"
 msgstr "_Fenêtre"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimer le résumé"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Imprimer le résumé"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Recharger"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Recharger la vue"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Par _société"
@@ -18141,8 +18171,8 @@ msgstr "Avec _catégorie"
 msgid "_Tasks"
 msgstr "_Tâches"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18387,23 +18417,23 @@ msgstr "_Rechercher"
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID de l'élément"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID du sous-élément"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Texte"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Rechercher _maintenant"
 
@@ -18416,3 +18446,35 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminé)"
+
+#~ msgid "No data provided"
+#~ msgstr "Aucune donnée fournie"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr ""
+#~ "Vérifier si les messages entrants, pour les comptes IMAP, sont des spams."
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Lancer le test de spam sur les messages entrant pour les comptes IMAP "
+#~ "(seulement valide si check_incoming est positionnée à vrai)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "_Ne pas vérifier l'arrivée de messages pour les comptes IMAP"
+
+#~ msgid "Print Summary"
+#~ msgstr "Imprimer le résumé"
+
+#~ msgid "Print summary"
+#~ msgstr "Imprimer le résumé"
+
+#~ msgid "Reload"
+#~ msgstr "Recharger"
+
+#~ msgid "Reload the view"
+#~ msgstr "Recharger la vue"
diff --git a/po/ga.po b/po/ga.po
index cfa2c5bd70..cf532df242 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-02 21:56+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -48,8 +48,7 @@ msgstr ""
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Tadhallaí"
 
@@ -89,19 +88,20 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Leabhar Seoladh Nua"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -109,65 +109,65 @@ msgstr "Leabhar Seoladh Nua"
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Álbachtaí..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Líosta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Liosta Tadhaill"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Cruthaigh liosta tadhaill nua"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr ""
 
@@ -180,39 +180,41 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "Freastalaí LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -220,7 +222,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -228,64 +230,68 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+msgid "The URI that the address book will display"
+msgstr ""
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -329,7 +335,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -361,16 +367,19 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
-msgstr ""
+#, fuzzy
+msgid "Address Book Creation Assistant"
+msgstr "Roghnachais na Leabhar Sheoladh"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Roghnachais na Leabhar Sheoladh"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr ""
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Leabhar Seoladh..."
 
 # ##
 # ## Languages (ISO 639 code in brackets)
@@ -378,7 +387,7 @@ msgstr ""
 # ##     in iso-639.def from glibc
 # aa 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "i gCónaí"
 
@@ -388,55 +397,56 @@ msgstr "Gan ainm"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Críochnaithe"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -446,30 +456,30 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Aon"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -480,7 +490,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -489,7 +499,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -497,38 +507,39 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Ceim 2: Eolas Freastalaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Fó"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -537,7 +548,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -545,7 +556,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -555,50 +566,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -606,28 +618,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Ú_sáid SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Ag Úsáid seoladh r-post:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -635,19 +647,19 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Ainm _taispeáint:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -656,39 +668,39 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "Uimhir _Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Ainm _Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "cartaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr ""
 
@@ -804,7 +816,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr ""
 
@@ -893,10 +905,10 @@ msgstr "_Catagóire..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -944,15 +956,15 @@ msgid "_Web page address:"
 msgstr "Seoladh leathanach greasán:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Seoladh"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2149,156 +2161,169 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
 # mt
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Seirbhís"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Áit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Ainm Úsaideoir"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Baile"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Obair"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Eile"
 
 # Avoid; either use KR or KP
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Tadhall"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Athraithe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Ainm Chuntas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Sábháil Tadhall  mar VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Gnó"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Eagar Ainm Fhada"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Ainm _Fhada:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "R-_phost:"
 
@@ -2454,11 +2479,11 @@ msgid "Is New List"
 msgstr "Is Líosta Nua"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Eagarthôir Líosta Tadhall"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Sábháil Lîosta mar VCard"
 
@@ -2544,13 +2569,13 @@ msgid "Email begins with"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
@@ -2567,102 +2592,102 @@ msgid "Type"
 msgstr "Saghas"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Leabhar Seoladh:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Sábháil mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Líosta Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Téigh go dtí Fillteán..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Albachtaí 'Pilot'..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Priontáil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Cóip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Amharc Reatha"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2671,8 +2696,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
 
@@ -2716,7 +2741,7 @@ msgstr "Fón Ghnó"
 
 # ta
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Rpost"
 
@@ -2776,7 +2801,7 @@ msgid "Nickname"
 msgstr "Leasainm"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Nota"
 
@@ -2785,7 +2810,7 @@ msgid "Office"
 msgstr "Oifig"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Eagrú"
 
@@ -2905,67 +2930,73 @@ msgstr ""
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "R-phost"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Obair"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "sonraí"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Fón Char"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 #, fuzzy
 msgid "Fax"
 msgstr "Facs Ghnó"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Leagan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
 # PE
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Tideal Post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Leathanach Baile"
 
@@ -2974,8 +3005,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3005,7 +3036,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3025,8 +3056,9 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
-msgstr ""
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Roghnachais na Leabhar Sheoladh"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -3156,8 +3188,9 @@ msgid "Add address to existing contact \"%s\""
 msgstr ""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Leabhar Seoladh..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -3211,17 +3244,40 @@ msgstr "Cóipcheart (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Comhphairt Post Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Comhphairt Coimriú Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Amharcóir Féilire Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Priontáil an tadhallaí seo"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Priontáil an tadhall seo"
 
@@ -3313,7 +3369,7 @@ msgstr "Imill"
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Roghanna"
 
@@ -3489,8 +3545,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Líosta gan ainm"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Pasfhocal, le do thoil"
 
@@ -3568,10 +3624,9 @@ msgstr "Comhpháirt Tascanna Evolution"
 
 # tg
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Tascanna"
 
@@ -3620,26 +3675,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Oscail"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Oscail"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3648,12 +3701,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3661,7 +3714,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3672,19 +3725,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3820,24 +3873,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Áit"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Féilire"
 
@@ -3864,7 +3923,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3886,70 +3945,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Féilire Nua"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "Fé_ilire"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4082,7 +4141,7 @@ msgstr "uair"
 msgid "minutes"
 msgstr "noimeaíd"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4155,7 +4214,7 @@ msgid "hour(s)"
 msgstr "uair"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -4166,7 +4225,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr ""
 
@@ -4217,7 +4276,7 @@ msgid "60 minutes"
 msgstr "60 noiméaid"
 
 # DZ
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4242,7 +4301,7 @@ msgid "Days"
 msgstr "Lae"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Cumasach"
 
@@ -4382,7 +4441,7 @@ msgid "_Fri"
 msgstr "_Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Giniréal"
 
@@ -4471,7 +4530,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Líosta Tasc Nua"
 
@@ -4616,23 +4675,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4668,8 +4727,8 @@ msgstr ""
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Sábháil mar..."
 
@@ -4697,10 +4756,21 @@ msgstr "Teip ag oscailt fillteán: %s: %s"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, c-format
+msgid "Select destination %s"
 msgstr ""
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Féilire"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Líosta tasc nua"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4803,7 +4873,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Coinne"
 
@@ -4827,23 +4897,31 @@ msgstr ""
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
@@ -4924,29 +5002,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -5132,7 +5210,7 @@ msgid "occurrences"
 msgstr ""
 
 #
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Dáta/Am:"
 
@@ -5167,7 +5245,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Scríos"
 
@@ -5207,7 +5285,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5231,7 +5309,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5244,7 +5322,7 @@ msgstr "% _Rinneadh"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Críochnaithe"
 
@@ -5257,7 +5335,7 @@ msgstr "Ard"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr ""
 
@@ -5276,7 +5354,7 @@ msgstr "Gnáth"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr ""
 
@@ -5316,16 +5394,16 @@ msgstr "Gnáth"
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5336,7 +5414,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Tuarascail:"
 
@@ -5526,11 +5604,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Coimriú"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "dath"
 
@@ -5555,7 +5632,7 @@ msgstr "T"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr ""
 
@@ -5587,10 +5664,10 @@ msgstr "Níl"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Gan fhois"
@@ -5603,100 +5680,106 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Tasc Nua"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Priontáil..."
 
 # PS
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Oscail"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Sábháil Mar..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Cóip"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Álbachtaí..."
 
@@ -5789,7 +5872,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr ""
 
@@ -5844,26 +5927,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "in"
@@ -6045,7 +6128,7 @@ msgstr ""
 
 # FR
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cealaigh"
@@ -6502,12 +6585,12 @@ msgstr "Tosaíocht:"
 msgid "Web Page:"
 msgstr "Leathanach Lín:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6517,7 +6600,7 @@ msgstr ""
 "  %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6525,12 +6608,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt tascanna as %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6539,29 +6622,39 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Ag Lódáil íomhanna"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Gan coinní."
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6684,16 +6777,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr "Eeolas iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6701,7 +6794,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6709,12 +6802,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6905,49 +6998,49 @@ msgid "Selected year (%Y)"
 msgstr ""
 
 # tg
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Tasc"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Stádas: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Tosaíocht: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Catagóire: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Tadhallaí: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Priontáil Reamhtaispeántais"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
@@ -6956,36 +7049,36 @@ msgstr "Socraigh Priontáil "
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Tasc"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Líosta tasc nua"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "Líosta _Tasc"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7038,26 +7131,26 @@ msgstr "Comhaid iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Comhaid vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Coinne - %s"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Féilire Gnome"
 
@@ -8739,7 +8832,7 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Ag Ssioncronaich fillteán"
 
@@ -8820,7 +8913,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8828,45 +8921,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8877,58 +8966,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Teip ar GPG: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr ""
 
@@ -9038,21 +9127,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Gan ainm"
@@ -9191,7 +9293,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9322,20 +9424,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9399,22 +9488,26 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Bruscar"
 
 # GN
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Bruscar"
@@ -9622,21 +9715,29 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
+#: camel/camel-vtrash-folder.c:44
+msgid "Cannot copy messages to the Trash folder"
+msgstr ""
+
+#: camel/camel-vtrash-folder.c:46
+msgid "Cannot copy messages to the Junk folder"
+msgstr ""
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9652,15 +9753,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Leabhar Seoladh:"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9680,68 +9776,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Pasfhocal"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Gnáth"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "líosta"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9756,7 +9850,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9765,12 +9859,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9784,25 +9878,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9857,27 +9951,36 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Post sceál do tadhall"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Freastalaí IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Seirbhís IMAP do %s as %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9886,64 +9989,64 @@ msgstr "Seirbhís IMAP do %s as %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9951,24 +10054,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9989,7 +10100,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr ""
@@ -10067,8 +10178,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10080,55 +10191,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Comhad phoist áitiúl %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Teip ag athainmigh '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Teip ag sábháil coimriú: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -10146,51 +10257,44 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Teip ag oscailt fillteán '%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
 #, c-format
-msgid "Folder `%s' does not exist."
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Níl eolaire maildir '%s' ann."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "níl eolaire maildir ann"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10212,9 +10316,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Ag stoir filtean"
@@ -10256,154 +10360,132 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
 msgstr ""
-"Teip ag oscailt comhad '%s':\n"
-"%s"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
-"Teip ag cruthaigh eolaire '%s':\n"
-"%s"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Teip ag cruthaigh comhd '%s':\n"
-"%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Is ainm fillteán nua neamhdhlíthe."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Teip ag athainmigh '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Teip ag athainmigh '%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Teip ag oscailt fillteán: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Earraidh gan fhois: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10417,9 +10499,16 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
 msgstr "Níl aon Eolaire `%s' ann."
 
 #: camel/providers/local/camel-mh-summary.c:244
@@ -10442,6 +10531,27 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Teip ag oscailt fillteán '%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10667,47 +10777,47 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Earraidh gan fhois: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Níl aon fillteán: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Ní raibh an grúpa ar fáil: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
 # FR
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10754,7 +10864,7 @@ msgstr "Scrios indiath %s la(e)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10834,7 +10944,7 @@ msgid "No such folder `%s'."
 msgstr "Níl aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10886,7 +10996,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11049,7 +11159,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -11155,34 +11265,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "ceangaltáin"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Ceangal comhad ar an scéal"
 
@@ -11299,69 +11409,69 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11370,13 +11480,13 @@ msgstr ""
 "Earraidh ag sábhháil scéal: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11384,50 +11494,50 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Oscail Comhad"
 
 # SG
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Siniú:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Uathcruthach"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11435,13 +11545,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11778,7 +11888,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
@@ -11792,19 +11902,19 @@ msgstr ""
 
 # IR
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr ""
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11886,7 +11996,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11902,7 +12012,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "soicind"
 
@@ -12076,7 +12186,7 @@ msgid "Junk Test"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Lipéid"
@@ -12185,9 +12295,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Ábhar"
 
@@ -12196,26 +12307,26 @@ msgstr "Ábhar"
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
 # vi
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -12255,15 +12366,15 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Foinse FFillteáin"
 
@@ -12312,9 +12423,9 @@ msgstr "Amharcóir fillteáin phost Evolution"
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Post"
 
@@ -12322,7 +12433,7 @@ msgstr "Post"
 msgid "Mail Accounts"
 msgstr "Cuntasaí Phoist"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Roghnachais Phoist"
 
@@ -12360,15 +12471,15 @@ msgstr ""
 msgid "[script]"
 msgstr ""
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12442,7 +12553,6 @@ msgid "Unread messages"
 msgstr "(Scéal gan tideál)"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12450,376 +12560,396 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Cruthaigh Fillteán Nua"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "FFilteáin"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Ag Lódáil..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Ní féidir an fillteán a bhogadh: %s"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Teíp ag dealaigh fillteán: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr ""
+"Teip ag dealaigh fillteán:\n"
+"%s"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dealaigh \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr ""
+"Teip ag athainmigh fillteán:\n"
+"%s"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Bog"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Athainmigh"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Roghanna..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "_Bog go Fillteán..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Gnáth"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Gan Siniú"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
 # SG
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Siniú Bhailithe."
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
 # SG
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Siniú neambhailí."
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Feach Teastas"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Leathanach %d as %d"
@@ -12862,29 +12992,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Ó"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -12898,8 +13033,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -12916,19 +13051,24 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Sábháil siniú"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12940,57 +13080,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr ""
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Sábháil Mar..."
 
 # US
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "íomhá_gan_tideál.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscail san %s..."
@@ -13036,17 +13176,17 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13055,36 +13195,42 @@ msgstr ""
 " Ní féidir sábháil go `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "scéal"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Suimigh seoladh"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Scéal ó %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13093,7 +13239,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13114,293 +13260,299 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
-msgid "Default forward style"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:12
-msgid "Default height of the Message Window"
+msgid "Default forward style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:13
-msgid "Default reply style"
+msgid "Default height of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:14
-msgid "Default width of the Message Window"
+msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Enable/disable caret mode"
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Height of the message-list pane"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Height of the message-list pane."
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Líosta do cuntasaí"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Taispeán Beocháin"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13408,182 +13560,206 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+#: 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/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Fán le do thoil"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/importers/elm-importer.c:244
+msgid "Importing Elm data"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr ""
-
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Ag socraigh ffilteán: %s"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, c-format
+msgid "Importing `%s'"
+msgstr ""
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Comhad Inchur"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13598,7 +13774,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13606,7 +13782,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13615,48 +13791,49 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
+#: mail/importers/netscape-importer.c:1677
+msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Álbachtaí"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Comhad Inchur"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Leabhar Seoladh:"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
 # PS
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13697,19 +13874,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Óst:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Ainm _Úsaideoir:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Slí:"
 
@@ -13758,28 +13935,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Fillteán Nua"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "_Fillteán"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Cruthaigh féilire nua"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13814,7 +14006,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
@@ -13836,118 +14028,114 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Eagarthóir Chuntas"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Eolas Cuntais"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ceangaltán"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Údarú"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltach (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltach (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Dathanna"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Post ríomhphost"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Ag Cruthach Scéaltaí"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Socrú"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13957,478 +14145,474 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Gnáth"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Iompar Loicthe"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Ag Scrios Post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Críochnaithe"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Cuntasaí Rphoist"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_Seoladh R-phost:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Álbachtaí Clófhoireann"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Aimsir"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 # ie
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Lipeideanna agus Dathanna"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Ag Lódáil íomhanna"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Áit do Bosca Phoist"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Scríobhóir Scéal"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Taispeántas Scéal"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Clófhoireanna Scéal"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Eagrú:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Roghnaigh dath"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Priontáil an tadhallaí seo"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Freagrair-Do"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Slándáil"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Saghas Freastalaî: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Suimigh Siniú"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Saghas _Udarú :"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Saghas _udarú :"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Síniú _gnáth:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "Ainm _fhada:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Post _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
 # GN
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Roghnaigh..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "sonraí"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14447,7 +14631,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Ag Obair"
 
@@ -14459,128 +14643,128 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Líosta do cuntasaí"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Fillteáin Áitiúl"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag Sábháil %d scéal(aí)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14589,7 +14773,7 @@ msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14598,11 +14782,11 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14611,22 +14795,22 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14659,38 +14843,38 @@ msgstr ""
 msgid "Security Information"
 msgstr "Eolas Slándáil"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastalaí: %s, Saghas: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Slí: %s, Saghas: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Saghas: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Cealaigh _Gach Uile"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
@@ -14793,20 +14977,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Eagar FFilteán"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Fillteán Nua"
 
@@ -15121,95 +15305,18 @@ msgstr ""
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Ní féidir an fillteán a bhogadh: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Cóip Fillteán"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Bog Fillteán"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Teip ag dealaigh fillteán:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Teip ag athainmigh fillteán:\n"
-"%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Teip ag scŕios fillteán:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(gan tideál)"
@@ -15332,7 +15439,7 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15370,6 +15477,10 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15474,123 +15585,6 @@ msgstr ""
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Ainm Grupa:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Cuir Grúpa Leis..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Scríos Grupa seo..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Athainmigh an Grupa seo..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Cruthaigh Aicearraí _Loicthe"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Cruthaigh Aicearraí Loicthe"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Athanimnigh Aicearra"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Oscail san _Fuinneog Nua"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Athainmigh an iaicearra seo"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Scríos"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Aicearraí"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15601,11 +15595,6 @@ msgstr ""
 msgid "New"
 msgstr "Nua"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" san \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15869,52 +15858,52 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Ainm Teastas"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Seoladh R-Post:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Amharcóir Teastas: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Pasfhocal do %s, le do thoil"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15975,7 +15964,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Teastas"
 
@@ -16040,11 +16029,11 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16089,210 +16078,210 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr ""
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Leagan"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Leagan 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Leagan 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Leagan 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
 # PK
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
@@ -16880,16 +16869,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "_Suim do Leabhar Seoladh"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "_Suim do Leabhar Seoladh"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17336,10 +17327,6 @@ msgstr "_Formáid"
 msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Oscail"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Oscail comhad"
@@ -17702,23 +17689,6 @@ msgstr ""
 msgid "_Window"
 msgstr "_Fuinneog"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Coimiriú Príont"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr ""
-
-# IS
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Athlódáil"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17780,8 +17750,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr "_Tascanna"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18027,23 +17997,23 @@ msgstr "C_uardaigh"
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Bánaigh"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Teacs"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr ""
 
@@ -18057,1024 +18027,1094 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Rinneadh)"
 
-msgid "Copy to folder..."
-msgstr "Cóip do Fillteán..."
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Teip ag oscailt comhad '%s':\n"
+#~ "%s"
 
-msgid "Move to folder..."
-msgstr "Bog go fillteán..."
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Teip ag cruthaigh eolaire '%s':\n"
+#~ "%s"
 
-msgid "Home Address"
-msgstr "Seoladh Bhaile"
+#~ msgid "    "
+#~ msgstr "      "
 
-msgid "Work Address"
-msgstr "Seoladh Obrithe"
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
 
-msgid "Other Address"
-msgstr "Seoladh Eile"
+#~ msgid "Copy Folder"
+#~ msgstr "Cóip Fillteán"
 
-msgid "Evolution Error"
-msgstr "Earráid Evolution"
+#~ msgid "Move Folder"
+#~ msgstr "Bog Fillteán"
 
-msgid "Error starting %s"
-msgstr "Earriadh ag tosnú %s"
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Teip ag scŕios fillteán:\n"
+#~ "%s"
 
-msgid "Create New Shortcut"
-msgstr "Cruthaigh Aicearra Nua"
+#~ msgid "Group name:"
+#~ msgstr "Ainm Grupa:"
 
-# vi
-msgid "Rename"
-msgstr "Athainmnigh"
+#~ msgid "_Add Group..."
+#~ msgstr "_Cuir Grúpa Leis..."
 
-msgid "Edit LDAP Server"
-msgstr "Eagar Freastalaí LDAP"
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Scríos Grupa seo..."
 
-msgid "_Folder:"
-msgstr "_Fillteaín:"
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Athainmigh an Grupa seo..."
 
-# YU
-msgid "Yugoslavia"
-msgstr "An Iúglaiv"
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Cruthaigh Aicearraí _Loicthe"
 
-msgid "<b>Task List</b>"
-msgstr "<b>Líosta Tasc</b>"
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Cruthaigh Aicearraí Loicthe"
 
-msgid "<b>Time</b>"
-msgstr "<b>Am</b> "
+#~ msgid "Rename Shortcut"
+#~ msgstr "Athanimnigh Aicearra"
 
-msgid "<b>Work Week</b>"
-msgstr "<b>Seachtain Oibre</b>"
+#~ msgid "Open in New _Window"
+#~ msgstr "Oscail san _Fuinneog Nua"
 
-msgid "<b>Date &amp; Time</b>"
-msgstr "<b>Data &amp; Am</b>"
+#~ msgid "Rename this shortcut"
+#~ msgstr "Athainmigh an iaicearra seo"
 
-msgid "<b>Description</b>"
-msgstr "<b>Tuarascail</b>"
+#~ msgid "Re_move"
+#~ msgstr "_Scríos"
 
-msgid "<b>L_ocation</b>"
-msgstr "<b>_Áit</b>"
+#~ msgid "Shortcuts"
+#~ msgstr "Aicearraí"
 
-msgid "<b>Su_mmary</b>"
-msgstr "<b>Coimriú</b>"
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" san \"%s\""
 
-msgid "<b>Preview</b>"
-msgstr "<b>Reamhthaispeáintas</b>"
+#~ msgid "Print Summary"
+#~ msgstr "Coimiriú Príont"
 
-msgid "<b>Web Page</b>"
-msgstr "<b>Leathanach Lín</b>"
+# IS
+#~ msgid "Reload"
+#~ msgstr "Athlódáil"
 
-msgid "Adding %s"
-msgstr "Ag Suimigh %s"
+#~ msgid "Copy to folder..."
+#~ msgstr "Cóip do Fillteán..."
 
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Teip ag cruthaigh eolaire\n"
-"%s\n"
-"Earraidh: %s"
+#~ msgid "Move to folder..."
+#~ msgstr "Bog go fillteán..."
 
-msgid "Select Calendar Folder"
-msgstr "Roghnaigh Fillteán Fhéilire"
+#~ msgid "Home Address"
+#~ msgstr "Seoladh Bhaile"
 
-msgid "Select Tasks Folder"
-msgstr "Roghnaigh Fillteán Tascanna"
+#~ msgid "Work Address"
+#~ msgstr "Seoladh Obrithe"
 
-msgid "Folder Settings"
-msgstr "Albachtaí Fillteáin"
+#~ msgid "Other Address"
+#~ msgstr "Seoladh Eile"
 
-msgid "New _Calendar"
-msgstr "_Féilire Nua"
+#~ msgid "Evolution Error"
+#~ msgstr "Earráid Evolution"
 
-msgid "Primary"
-msgstr "Tosaíocht"
+#~ msgid "Error starting %s"
+#~ msgstr "Earriadh ag tosnú %s"
 
-msgid "Prim"
-msgstr "Tos."
+#~ msgid "Create New Shortcut"
+#~ msgstr "Cruthaigh Aicearra Nua"
 
-msgid "Bus"
-msgstr "Gnó"
+# vi
+#~ msgid "Rename"
+#~ msgstr "Athainmnigh"
 
-msgid "Company"
-msgstr "Teoranta"
+#~ msgid "Edit LDAP Server"
+#~ msgstr "Eagar Freastalaí LDAP"
 
-msgid "Comp"
-msgstr "Teor."
+#~ msgid "_Folder:"
+#~ msgstr "_Fillteaín:"
 
-msgid "Org"
-msgstr "Eag."
+# YU
+#~ msgid "Yugoslavia"
+#~ msgstr "An Iúglaiv"
 
-msgid "Mobile"
-msgstr "Guthán Póca"
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Líosta Tasc</b>"
 
-msgid "Car"
-msgstr "Car"
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Am</b> "
 
-msgid "Bus Fax"
-msgstr "Facs Ghnó"
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Seachtain Oibre</b>"
 
-msgid "Business 2"
-msgstr "Gnó 2"
+#~ msgid "<b>Date &amp; Time</b>"
+#~ msgstr "<b>Data &amp; Am</b>"
 
-msgid "Bus 2"
-msgstr "Gnó 2"
+#~ msgid "<b>Description</b>"
+#~ msgstr "<b>Tuarascail</b>"
 
-msgid "Home 2"
-msgstr "Baile 2"
+#~ msgid "<b>L_ocation</b>"
+#~ msgstr "<b>_Áit</b>"
 
-msgid "ISDN"
-msgstr "ISDN"
+#~ msgid "<b>Su_mmary</b>"
+#~ msgstr "<b>Coimriú</b>"
 
-msgid "TTY"
-msgstr "TTY"
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Reamhthaispeáintas</b>"
 
-msgid "Url"
-msgstr "Url"
+#~ msgid "<b>Web Page</b>"
+#~ msgstr "<b>Leathanach Lín</b>"
 
-msgid "Department"
-msgstr "Roinn"
+#~ msgid "Adding %s"
+#~ msgstr "Ag Suimigh %s"
 
-msgid "Dep"
-msgstr "Ran."
+#~ msgid ""
+#~ "Cannot create the directory\n"
+#~ "%s\n"
+#~ "Error: %s"
+#~ msgstr ""
+#~ "Teip ag cruthaigh eolaire\n"
+#~ "%s\n"
+#~ "Earraidh: %s"
 
-msgid "Off"
-msgstr "Oif."
+#~ msgid "Select Calendar Folder"
+#~ msgstr "Roghnaigh Fillteán Fhéilire"
 
-msgid "Prof"
-msgstr "Dea."
+#~ msgid "Select Tasks Folder"
+#~ msgstr "Roghnaigh Fillteán Tascanna"
 
-msgid "Man"
-msgstr "Bain."
+#~ msgid "Folder Settings"
+#~ msgstr "Albachtaí Fillteáin"
 
-msgid "Ass"
-msgstr "Cnt."
+#~ msgid "New _Calendar"
+#~ msgstr "_Féilire Nua"
 
-msgid "Nick"
-msgstr "L.ainm."
+#~ msgid "Primary"
+#~ msgstr "Tosaíocht"
 
-msgid "Calendar URI"
-msgstr "Féilire URI"
+#~ msgid "Prim"
+#~ msgstr "Tos."
 
-msgid "CALUri"
-msgstr "CALUri"
+#~ msgid "Bus"
+#~ msgstr "Gnó"
 
-msgid "FBUrl"
-msgstr "FBUrl"
+#~ msgid "Company"
+#~ msgstr "Teoranta"
 
-msgid "Default server calendar"
-msgstr "Féilire freastalaí loicthe"
+#~ msgid "Comp"
+#~ msgstr "Teor."
 
-msgid "icsCalendar"
-msgstr "icsFéilire"
+#~ msgid "Org"
+#~ msgstr "Eag."
 
-msgid "Birth Date"
-msgstr "Dáta Breithe"
+#~ msgid "Mobile"
+#~ msgstr "Guthán Póca"
 
-msgid "ECard"
-msgstr "RCarta"
+#~ msgid "Car"
+#~ msgstr "Car"
 
-msgid "%x"
-msgstr "%x"
+#~ msgid "Bus Fax"
+#~ msgstr "Facs Ghnó"
 
-msgid "Address Label"
-msgstr "Lipéad Sheoladh"
+#~ msgid "Business 2"
+#~ msgstr "Gnó 2"
 
-msgid "Birth date"
-msgstr "Dáta Breithe"
+#~ msgid "Bus 2"
+#~ msgstr "Gnó 2"
 
-msgid "ICS Calendar"
-msgstr "Féilire ICS"
+#~ msgid "Home 2"
+#~ msgstr "Baile 2"
 
-msgid "Category List"
-msgstr "Liosta Catagóire"
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
 
-msgid "Arbitrary"
-msgstr "Ar Togradh"
+#~ msgid "TTY"
+#~ msgstr "TTY"
 
-msgid "Searching..."
-msgstr "Ag Cuardaigh..."
+#~ msgid "Url"
+#~ msgstr "Url"
 
-msgid "Using Email Address"
-msgstr "Le Seoladh Rpost:"
+#~ msgid "Department"
+#~ msgstr "Roinn"
 
-msgid "Public Contacts"
-msgstr "Tadhallaí Phoiblí"
+#~ msgid "Dep"
+#~ msgstr "Ran."
 
-msgid "Other Contacts"
-msgstr "Tadhallaí Eile"
+#~ msgid "Off"
+#~ msgstr "Oif."
 
-msgid "Card"
-msgstr "Carta"
+#~ msgid "Prof"
+#~ msgstr "Dea."
 
-msgid "Is New Card"
-msgstr "Is Carta Nua"
+#~ msgid "Man"
+#~ msgstr "Bain."
 
-msgid "No cards"
-msgstr "Gan cartaí"
+#~ msgid "Ass"
+#~ msgstr "Cnt."
 
-msgid "1 card"
-msgstr "1 carta"
+#~ msgid "Nick"
+#~ msgstr "L.ainm."
 
-# FIXME : Grammar ? 
-msgid "%d cards"
-msgstr "%d cartaí"
+#~ msgid "Calendar URI"
+#~ msgstr "Féilire URI"
 
-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,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
+#~ msgid "CALUri"
+#~ msgstr "CALUri"
 
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgid "FBUrl"
+#~ msgstr "FBUrl"
 
-msgid "Business Address"
-msgstr "Seoladh Ghnó"
+#~ msgid "Default server calendar"
+#~ msgstr "Féilire freastalaí loicthe"
 
-msgid "Print cards"
-msgstr "Priontáil Cartaí"
+#~ msgid "icsCalendar"
+#~ msgstr "icsFéilire"
 
-msgid "Print card"
-msgstr "Priontáil carta"
+#~ msgid "Birth Date"
+#~ msgstr "Dáta Breithe"
 
-msgid "Public Calendar"
-msgstr "Féilire Poiblí"
+#~ msgid "ECard"
+#~ msgstr "RCarta"
 
-msgid "Public Tasks"
-msgstr "Tascanna Poiblí"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-msgid "_Save as..."
-msgstr "_Sábháil mar..."
+#~ msgid "Address Label"
+#~ msgstr "Lipéad Sheoladh"
 
-msgid "New _Appointment"
-msgstr "_Coinne Nua"
+#~ msgid "Birth date"
+#~ msgstr "Dáta Breithe"
 
-msgid "Print..."
-msgstr "Clódáil..."
+#~ msgid "ICS Calendar"
+#~ msgstr "Féilire ICS"
 
-msgid "Opening calendar at %s"
-msgstr "Ag oscailt féilire as %s"
+#~ msgid "Category List"
+#~ msgstr "Liosta Catagóire"
 
-msgid "Properties for \"%s\""
-msgstr "Albachtaí do \"%s\""
+#~ msgid "Arbitrary"
+#~ msgstr "Ar Togradh"
 
-msgid "%d new"
-msgstr "%d nua"
+#~ msgid "Searching..."
+#~ msgstr "Ag Cuardaigh..."
 
-msgid ", "
-msgstr ", "
+#~ msgid "Using Email Address"
+#~ msgstr "Le Seoladh Rpost:"
 
-msgid "%d total"
-msgstr "%d íomlán"
+#~ msgid "Public Contacts"
+#~ msgstr "Tadhallaí Phoiblí"
 
-msgid "Send anyway?"
-msgstr "Post ar aon nós?"
+#~ msgid "Other Contacts"
+#~ msgstr "Tadhallaí Eile"
 
-msgid "Save Messages As..."
-msgstr "Sábháil Scéala Mar..."
+#~ msgid "Card"
+#~ msgstr "Carta"
 
-msgid "Save Image as..."
-msgstr "Sábháil Iomha le..."
+#~ msgid "Is New Card"
+#~ msgstr "Is Carta Nua"
 
-msgid "Bad Address"
-msgstr "Droch Seoladh"
+#~ msgid "No cards"
+#~ msgstr "Gan cartaí"
 
-msgid "Local folders/%s"
-msgstr "Fillteán áitiiúl/%s"
+#~ msgid "1 card"
+#~ msgstr "1 carta"
 
-msgid "Empty Message"
-msgstr "Scéal Fólamh"
+# FIXME : Grammar ? 
+#~ msgid "%d cards"
+#~ msgstr "%d cartaí"
 
-msgid "(No subject)"
-msgstr "(Gan ábhar)"
+#~ 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,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 
-msgid "%s - Message"
-msgstr "%s - Scéal"
+#~ msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-msgid "Evolution Summary"
-msgstr "Coimriú Evolution"
+#~ msgid "Business Address"
+#~ msgstr "Seoladh Ghnó"
 
-msgid "Evolution Summary component"
-msgstr "Comhphairt Coimriú Evolution"
+#~ msgid "Print cards"
+#~ msgstr "Priontáil Cartaí"
 
-msgid "Summary Preferences"
-msgstr "Roghnachais Choimriú"
+#~ msgid "Print card"
+#~ msgstr "Priontáil carta"
 
-msgid "Africa"
-msgstr "An Afraic"
+#~ msgid "Public Calendar"
+#~ msgstr "Féilire Poiblí"
 
-# AQ
-msgid "Antartica"
-msgstr "an tAntartach"
+#~ msgid "Public Tasks"
+#~ msgstr "Tascanna Poiblí"
 
-# AT
-msgid "Asia"
-msgstr "An Áise"
+#~ msgid "_Save as..."
+#~ msgstr "_Sábháil mar..."
 
-# AQ
-msgid "Atlantic"
-msgstr "Atlantach"
+#~ msgid "New _Appointment"
+#~ msgstr "_Coinne Nua"
 
-# CM
-msgid "Cameron"
-msgstr "Camarún"
+#~ msgid "Print..."
+#~ msgstr "Clódáil..."
 
-msgid "Dublin"
-msgstr "Baile Átha Cliath"
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Ag oscailt féilire as %s"
 
-# SV
-msgid "El Salvador Int."
-msgstr "An tSalvadóir Idirn."
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Albachtaí do \"%s\""
 
-msgid "Leuchars"
-msgstr "bliana"
+#~ msgid "%d new"
+#~ msgstr "%d nua"
 
-msgid "Middle East"
-msgstr "An Meánoirthear"
+#~ msgid ", "
+#~ msgstr ", "
 
-msgid "Russia"
-msgstr "Rúisis"
+#~ msgid "%d total"
+#~ msgstr "%d íomlán"
 
-msgid "United Arab Emirates "
-msgstr "Aontas na nÉimíríochtaí Arabacha"
+#~ msgid "Send anyway?"
+#~ msgstr "Post ar aon nós?"
 
-msgid "Wien"
-msgstr "Vín"
+#~ msgid "Save Messages As..."
+#~ msgstr "Sábháil Scéala Mar..."
 
-msgid "Appointments"
-msgstr "Coinní"
+#~ msgid "Save Image as..."
+#~ msgstr "Sábháil Iomha le..."
 
-msgid "No appointments."
-msgstr "Gan coinní."
+#~ msgid "Bad Address"
+#~ msgstr "Droch Seoladh"
 
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
+#~ msgid "Local folders/%s"
+#~ msgstr "Fillteán áitiiúl/%s"
 
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M%p %d %B"
+#~ msgid "Empty Message"
+#~ msgstr "Scéal Fólamh"
 
-msgid "Mail summary"
-msgstr "Coimriú phoist"
+#~ msgid "(No subject)"
+#~ msgstr "(Gan ábhar)"
 
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Focal do Lae"
+#~ msgid "%s - Message"
+#~ msgstr "%s - Scéal"
 
-msgid "New News Feed"
-msgstr "Bealach Nuachtáin Nua"
+#~ msgid "Evolution Summary"
+#~ msgstr "Coimriú Evolution"
 
-msgid "_URL:"
-msgstr "_URL:"
+#~ msgid "Summary Preferences"
+#~ msgstr "Roghnachais Choimriú"
 
-msgid "News Feed"
-msgstr "Foth Nuachtáin"
+#~ msgid "Africa"
+#~ msgstr "An Afraic"
 
-msgid "All"
-msgstr "Gach Uile"
+# AQ
+#~ msgid "Antartica"
+#~ msgstr "an tAntartach"
 
-msgid "No tasks"
-msgstr "Gan Tascanna"
+# AT
+#~ msgid "Asia"
+#~ msgstr "An Áise"
 
-msgid "blue"
-msgstr "gorm"
+# AQ
+#~ msgid "Atlantic"
+#~ msgstr "Atlantach"
 
-msgid "(No Description)"
-msgstr "(Gan Tuarascail)"
+# CM
+#~ msgid "Cameron"
+#~ msgstr "Camarún"
 
-msgid "My Weather"
-msgstr "Aimsir"
+#~ msgid "Dublin"
+#~ msgstr "Baile Átha Cliath"
 
-msgid "Weather"
-msgstr "Aimsir"
+# SV
+#~ msgid "El Salvador Int."
+#~ msgstr "An tSalvadóir Idirn."
 
-msgid "KBOS"
-msgstr "KBOS"
+#~ msgid "Leuchars"
+#~ msgstr "bliana"
 
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
+#~ msgid "Middle East"
+#~ msgstr "An Meánoirthear"
 
-msgid "Please wait..."
-msgstr "Fán le do thoil..."
+#~ msgid "Russia"
+#~ msgstr "Rúisis"
 
-msgid " F"
-msgstr " F"
+#~ msgid "United Arab Emirates "
+#~ msgstr "Aontas na nÉimíríochtaí Arabacha"
 
-msgid "kph"
-msgstr "kph"
+#~ msgid "Wien"
+#~ msgstr "Vín"
 
-msgid "inHg"
-msgstr "inHg"
+#~ msgid "Appointments"
+#~ msgstr "Coinní"
 
-msgid "mmHg"
-msgstr "mmHg"
+#~ msgid "%k:%M %d %B"
+#~ msgstr "%k:%M %d %B"
 
-msgid "miles"
-msgstr "míle"
+#~ msgid "%l:%M%p %d %B"
+#~ msgstr "%l:%M%p %d %B"
 
-msgid "kilometers"
-msgstr "km"
+#~ msgid "Mail summary"
+#~ msgstr "Coimriú phoist"
 
-msgid "Scattered clouds"
-msgstr "Scamaill Scaipthe"
+#~ msgid "Dictionary.com Word of the Day"
+#~ msgstr "Dictionary.com Focal do Lae"
 
-msgid "Few clouds"
-msgstr "Beagán Scamallach"
+#~ msgid "New News Feed"
+#~ msgstr "Bealach Nuachtáin Nua"
 
-msgid "Overcast"
-msgstr "Dorcha"
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
 
-msgid "Variable"
-msgstr "Luaineach"
+#~ msgid "News Feed"
+#~ msgstr "Foth Nuachtáin"
 
-msgid "North"
-msgstr "Tuaisceart"
+#~ msgid "All"
+#~ msgstr "Gach Uile"
 
-msgid "South"
-msgstr "Deisceart"
+#~ msgid "No tasks"
+#~ msgstr "Gan Tascanna"
 
-msgid "Rain"
-msgstr "Báisteach"
+#~ msgid "blue"
+#~ msgstr "gorm"
 
-msgid "Snow"
-msgstr "Sneachta"
+#~ msgid "(No Description)"
+#~ msgstr "(Gan Tuarascail)"
 
-msgid "C_elsius"
-msgstr "C_elsius"
+#~ msgid "My Weather"
+#~ msgstr "Aimsir"
 
-msgid "News Feeds"
-msgstr "Fotha Nuachtain"
+#~ msgid "Weather"
+#~ msgstr "Aimsir"
 
-msgid "One mont_h"
-msgstr "Aon _mhí"
+#~ msgid "KBOS"
+#~ msgstr "KBOS"
 
-msgid "One w_eek"
-msgstr "Aon _seachtain"
+#~ msgid "%A, %B %e %Y"
+#~ msgstr "%A, %B %e %Y"
 
-msgid "Show _all tasks"
-msgstr "Taispeán gach tascanna"
+#~ msgid "Please wait..."
+#~ msgstr "Fán le do thoil..."
 
-msgid "Show temperatures in:"
-msgstr "Taispeán teocht as:"
+#~ msgid " F"
+#~ msgstr " F"
 
-msgid "Weather Settings"
-msgstr "Albachtaí Aimsir"
+#~ msgid "kph"
+#~ msgstr "kph"
 
-msgid "_Delete Feed"
-msgstr "_Scrios Fotha"
+#~ msgid "inHg"
+#~ msgstr "inHg"
 
-msgid "_Five days"
-msgstr "_Cúig lá"
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
 
-msgid "_New Feed"
-msgstr "Foth _Nua"
+#~ msgid "miles"
+#~ msgstr "míle"
 
-msgid "Add a Folder"
-msgstr "Cuir Fillteán Leis"
+#~ msgid "kilometers"
+#~ msgstr "km"
 
-msgid "Outbox"
-msgstr "Asbosca"
+#~ msgid "Scattered clouds"
+#~ msgstr "Scamaill Scaipthe"
 
-msgid "Syncing Folder"
-msgstr "ag Ssioncronaich Fillteán"
+#~ msgid "Few clouds"
+#~ msgstr "Beagán Scamallach"
 
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#~ msgid "Overcast"
+#~ msgstr "Dorcha"
 
-msgid "(None)"
-msgstr "(Ar Bith)"
+#~ msgid "Variable"
+#~ msgstr "Luaineach"
 
-msgid "No error"
-msgstr "Gan Earraidh"
+#~ msgid "North"
+#~ msgstr "Tuaisceart"
 
-msgid "I/O error"
-msgstr "Earraidh I/A"
+#~ msgid "South"
+#~ msgstr "Deisceart"
 
-msgid "CORBA error"
-msgstr "Earraidh CORBA"
+#~ msgid "Rain"
+#~ msgstr "Báisteach"
 
-msgid "No owner"
-msgstr "Gan Úinéar"
+#~ msgid "Snow"
+#~ msgstr "Sneachta"
 
-msgid "Has subfolders"
-msgstr "Post an sceál seo"
+#~ msgid "C_elsius"
+#~ msgstr "C_elsius"
 
-msgid "Copy this folder"
-msgstr "_Fillteán"
+#~ msgid "News Feeds"
+#~ msgstr "Fotha Nuachtain"
 
-msgid "Create a new shortcut"
-msgstr "Cruthaigh aicearra nua"
+#~ msgid "One mont_h"
+#~ msgstr "Aon _mhí"
 
-msgid "Evolution _Window"
-msgstr "_Fuinneog Evolution"
+#~ msgid "One w_eek"
+#~ msgstr "Aon _seachtain"
 
-msgid "Open this folder in an other window"
-msgstr "Post an sceál seo"
+#~ msgid "Show _all tasks"
+#~ msgstr "Taispeán gach tascanna"
 
-msgid "_Copy..."
-msgstr "_Cóip..."
+#~ msgid "Show temperatures in:"
+#~ msgstr "Taispeán teocht as:"
 
-msgid "_Folder..."
-msgstr "_Fillteán..."
+#~ msgid "Weather Settings"
+#~ msgstr "Albachtaí Aimsir"
 
-msgid "_Move..."
-msgstr "_Bog..."
+#~ msgid "_Delete Feed"
+#~ msgstr "_Scrios Fotha"
 
-msgid "_New Folder"
-msgstr "Fillteán _Nua"
+#~ msgid "_Five days"
+#~ msgstr "_Cúig lá"
 
-msgid "Information"
-msgstr "Eolas"
+#~ msgid "_New Feed"
+#~ msgstr "Foth _Nua"
 
-msgid "Error"
-msgstr "Earraidh"
+#~ msgid "Add a Folder"
+#~ msgstr "Cuir Fillteán Leis"
 
-msgid "Clear"
-msgstr "Bánaigh"
+#~ msgid "Outbox"
+#~ msgstr "Asbosca"
 
-msgid "De_lete"
-msgstr "_Dealaigh"
+#~ msgid "Syncing Folder"
+#~ msgstr "ag Ssioncronaich Fillteán"
 
-msgid "Font Preferences"
-msgstr "Roghnachais Chlôfireann"
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
 
-msgid "Emacs"
-msgstr "Emacs"
+#~ msgid "(None)"
+#~ msgstr "(Ar Bith)"
 
-msgid "Delete news feed"
-msgstr "Dealaigh fotha nuachtan"
+#~ msgid "No error"
+#~ msgstr "Gan Earraidh"
 
-msgid "_Mail"
-msgstr "_Post"
+#~ msgid "I/O error"
+#~ msgstr "Earraidh I/A"
 
-msgid "_every"
-msgstr "_gach"
+#~ msgid "CORBA error"
+#~ msgstr "Earraidh CORBA"
 
-msgid "_Clear Flag"
-msgstr "_Bánaigh Bratach"
+#~ msgid "No owner"
+#~ msgstr "Gan Úinéar"
 
-msgid "S_elect server: "
-msgstr "_Roghnaigh freastalaí: "
+#~ msgid "Has subfolders"
+#~ msgstr "Post an sceál seo"
 
-msgid "Add"
-msgstr "Suimigh"
+#~ msgid "Copy this folder"
+#~ msgstr "_Fillteán"
 
-# SG
-msgid "_Signature editor"
-msgstr "Eagarthóir Siniú"
+#~ msgid "Create a new shortcut"
+#~ msgstr "Cruthaigh aicearra nua"
 
-msgid "Create _New Folder..."
-msgstr "Cruthaigh Fillteán _Nua..."
+#~ msgid "Evolution _Window"
+#~ msgstr "_Fuinneog Evolution"
 
-msgid "_Contacts..."
-msgstr "_Tadhallaí..."
+#~ msgid "Open this folder in an other window"
+#~ msgstr "Post an sceál seo"
 
-msgid "1234"
-msgstr "1234"
+#~ msgid "_Copy..."
+#~ msgstr "_Cóip..."
 
-msgid "<- _Remove"
-msgstr "<- _Scríos"
+#~ msgid "_Folder..."
+#~ msgstr "_Fillteán..."
 
-msgid "C_ontacts..."
-msgstr "_Tadhallaí..."
+#~ msgid "_Move..."
+#~ msgstr "_Bog..."
 
-msgid "Phone Types"
-msgstr "Saghais Guthán"
+#~ msgid "_New Folder"
+#~ msgstr "Fillteán _Nua"
 
-msgid "Delete Contact?"
-msgstr "Dealaigh Tadhall?"
+#~ msgid "Information"
+#~ msgstr "Eolas"
 
-msgid "Display Cards?"
-msgstr "Taispeán Cartaí?"
+#~ msgid "Error"
+#~ msgstr "Earraidh"
 
-msgid "Display Cards"
-msgstr "Taispeán Cartaí"
+#~ msgid "Clear"
+#~ msgstr "Bánaigh"
 
-msgid "rd"
-msgstr "r"
+#~ msgid "De_lete"
+#~ msgstr "_Dealaigh"
 
-msgid "Print Calendar"
-msgstr "Priontáil Féilre"
+#~ msgid "Font Preferences"
+#~ msgstr "Roghnachais Chlôfireann"
 
-msgid "Warning!"
-msgstr "Rabhadh!"
+#~ msgid "Emacs"
+#~ msgstr "Emacs"
 
-msgid "hour"
-msgstr "uair"
+#~ msgid "Delete news feed"
+#~ msgstr "Dealaigh fotha nuachtan"
 
-msgid "week"
-msgstr "seachtain"
+#~ msgid "_Mail"
+#~ msgstr "_Post"
 
-msgid "year"
-msgstr "bliain"
+#~ msgid "_every"
+#~ msgstr "_gach"
 
-msgid "Add Signature"
-msgstr "Suimigh Siniú"
+#~ msgid "_Clear Flag"
+#~ msgstr "_Bánaigh Bratach"
 
-msgid "Account %d"
-msgstr "Cuntas %d"
+#~ msgid "S_elect server: "
+#~ msgstr "_Roghnaigh freastalaí: "
 
-msgid "All folders"
-msgstr "Gach fillteáin"
+#~ msgid "Add"
+#~ msgstr "Suimigh"
 
-msgid "Apri file"
-msgstr "Comhad 'Apri'"
+# SG
+#~ msgid "_Signature editor"
+#~ msgstr "Eagarthóir Siniú"
 
-msgid "Salve file"
-msgstr "Comhad 'Salve'"
+#~ msgid "Create _New Folder..."
+#~ msgstr "Cruthaigh Fillteán _Nua..."
 
-msgid "New..."
-msgstr "Nua..."
+#~ msgid "_Contacts..."
+#~ msgstr "_Tadhallaí..."
 
-msgid "Host"
-msgstr "Óst"
+#~ msgid "1234"
+#~ msgstr "1234"
 
-msgid "Output File"
-msgstr "Comhad Aschur"
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Scríos"
 
-msgid "_Configure..."
-msgstr "_Socraigh..."
+#~ msgid "C_ontacts..."
+#~ msgstr "_Tadhallaí..."
 
-msgid "_Configure Pilot..."
-msgstr "_Socraigh Pilot..."
+#~ msgid "Phone Types"
+#~ msgstr "Saghais Guthán"
 
-msgid " "
-msgstr " "
+#~ msgid "Delete Contact?"
+#~ msgstr "Dealaigh Tadhall?"
 
-# FIXME SP?
-msgid "Select PGP program"
-msgstr "Roghnaigh Ríomhchlár PGP"
+#~ msgid "Display Cards?"
+#~ msgstr "Taispeán Cartaí?"
 
-# SG
-msgid "Signature #1"
-msgstr "Síniú #1"
+#~ msgid "Display Cards"
+#~ msgstr "Taispeán Cartaí"
 
-# SG
-msgid "Signature #2"
-msgstr "Síniú #2"
+#~ msgid "rd"
+#~ msgstr "r"
 
-msgid "&lt;- _Remove"
-msgstr "&lt;- _Scríos"
+#~ msgid "Print Calendar"
+#~ msgstr "Priontáil Féilre"
 
-msgid "_Add -&gt;"
-msgstr "_Suimigh -&gt;"
+#~ msgid "Warning!"
+#~ msgstr "Rabhadh!"
 
-msgid "1 byte"
-msgstr "1 byte"
+#~ msgid "hour"
+#~ msgstr "uair"
 
-msgid "%u bytes"
-msgstr "%u bytanna"
+#~ msgid "week"
+#~ msgstr "seachtain"
 
-msgid "_Preferences..."
-msgstr "_Roghnachais..."
+#~ msgid "year"
+#~ msgstr "bliain"
 
-msgid "_Browse..."
-msgstr "_Brábhsáil..."
+#~ msgid "Add Signature"
+#~ msgstr "Suimigh Siniú"
 
-msgid "I/O Error: %s"
-msgstr "Earraidh I/A: %s"
+#~ msgid "Account %d"
+#~ msgstr "Cuntas %d"
 
-msgid "NNTP Server:"
-msgstr "Freastalaî NNTP:"
+#~ msgid "All folders"
+#~ msgstr "Gach fillteáin"
 
-msgid "View messages..."
-msgstr "Feach scéalaí..."
+#~ msgid "Apri file"
+#~ msgstr "Comhad 'Apri'"
 
-msgid "_Pilot Settings..."
-msgstr "_Álbachtaí Pilot..."
+#~ msgid "Salve file"
+#~ msgstr "Comhad 'Salve'"
 
-msgid "_End of day:"
-msgstr "_Deireadh an Lá"
+#~ msgid "New..."
+#~ msgstr "Nua..."
 
-msgid "%s server %s"
-msgstr "%s freastalaí %s"
+#~ msgid "Host"
+#~ msgstr "Óst"
 
-msgid "(unknown host)"
-msgstr "(óst gan fhois)"
+#~ msgid "Output File"
+#~ msgstr "Comhad Aschur"
 
-msgid "No such message: %s"
-msgstr "Ni raibh scéal sinn: %s"
+#~ msgid "_Configure..."
+#~ msgstr "_Socraigh..."
 
-msgid " Edit "
-msgstr "Eagar "
+#~ msgid "_Configure Pilot..."
+#~ msgstr "_Socraigh Pilot..."
 
-msgid "_Language:"
-msgstr "_Teanga:"
+#~ msgid " "
+#~ msgstr " "
 
-msgid "Signature name:"
-msgstr "Ainm Siniú:"
+# FIXME SP?
+#~ msgid "Select PGP program"
+#~ msgstr "Roghnaigh Ríomhchlár PGP"
 
-msgid "_Other"
-msgstr "_Eile"
+# SG
+#~ msgid "Signature #1"
+#~ msgstr "Síniú #1"
 
-msgid "Run %s"
-msgstr "Rith %s"
+# SG
+#~ msgid "Signature #2"
+#~ msgstr "Síniú #2"
 
-msgid "Close %s"
-msgstr "Dún %s"
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- _Scríos"
 
-msgid "page"
-msgstr "leathanach"
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Suimigh -&gt;"
 
-msgid "RDF Summary"
-msgstr "Coimriú RDF"
+#~ msgid "1 byte"
+#~ msgstr "1 byte"
 
-msgid "Mailbox Format"
-msgstr "Formóid Boscaphoist"
+#~ msgid "%u bytes"
+#~ msgstr "%u bytanna"
 
-msgid "%s: Inbox"
-msgstr "%s: Inbosca"
+#~ msgid "_Preferences..."
+#~ msgstr "_Roghnachais..."
 
-msgid "Display"
-msgstr "Taispeán"
+#~ msgid "_Browse..."
+#~ msgstr "_Brábhsáil..."
 
-msgid "Edit..."
-msgstr "Eagar..."
+#~ msgid "I/O Error: %s"
+#~ msgstr "Earraidh I/A: %s"
 
-msgid "News"
-msgstr "Nuacht"
+#~ msgid "NNTP Server:"
+#~ msgstr "Freastalaî NNTP:"
 
-msgid "_Organization:"
-msgstr "_Buidheann"
+#~ msgid "View messages..."
+#~ msgstr "Feach scéalaí..."
 
-msgid "_Server type: "
-msgstr "Saghas _Freastalaí: "
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Álbachtaí Pilot..."
 
-msgid "seconds."
-msgstr "soicind."
+#~ msgid "_End of day:"
+#~ msgstr "_Deireadh an Lá"
 
-msgid "Mail Summary"
-msgstr "Coimriú Nua"
+#~ msgid "%s server %s"
+#~ msgstr "%s freastalaí %s"
 
-msgid "(No name)"
-msgstr "(gan ainm)"
+#~ msgid "(unknown host)"
+#~ msgstr "(óst gan fhois)"
 
-msgid "Create a _New Meeting"
-msgstr "Cruthaigh Cruinniú _Nua"
+#~ msgid "No such message: %s"
+#~ msgstr "Ni raibh scéal sinn: %s"
 
-msgid "New Appointment"
-msgstr "Coinne Nua"
+#~ msgid " Edit "
+#~ msgstr "Eagar "
 
-msgid "_Appointment..."
-msgstr "_Coinne..."
+#~ msgid "_Language:"
+#~ msgstr "_Teanga:"
 
-msgid "_Calendar Settings..."
-msgstr "Álbachtaí _Féilire..."
+#~ msgid "Signature name:"
+#~ msgstr "Ainm Siniú:"
 
-msgid "_Task..."
-msgstr "_Tasc..."
+#~ msgid "_Other"
+#~ msgstr "_Eile"
 
-msgid "Sear_ch"
-msgstr "_Cuardaigh"
+#~ msgid "Run %s"
+#~ msgstr "Rith %s"
 
-msgid "Card: "
-msgstr "Carta: "
+#~ msgid "Close %s"
+#~ msgstr "Dún %s"
 
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ainm: "
+#~ msgid "page"
+#~ msgstr "leathanach"
 
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-" Clann:       "
+#~ msgid "RDF Summary"
+#~ msgstr "Coimriú RDF"
 
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Seoladh:"
+#~ msgid "Mailbox Format"
+#~ msgstr "Formóid Boscaphoist"
 
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-" Bosca Phoist: "
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Inbosca"
 
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Stráid:      "
+#~ msgid "Display"
+#~ msgstr "Taispeán"
 
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cathair:     "
+#~ msgid "Edit..."
+#~ msgstr "Eagar..."
 
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Cuige:      "
+#~ msgid "News"
+#~ msgstr "Nuacht"
 
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Cód Phoist:  "
+#~ msgid "_Organization:"
+#~ msgstr "_Buidheann"
 
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-" Tír:          "
+#~ msgid "_Server type: "
+#~ msgstr "Saghas _Freastalaí: "
 
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Gutháin:   \n"
+#~ msgid "seconds."
+#~ msgstr "soicind."
 
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Guthán:"
+#~ msgid "Mail Summary"
+#~ msgstr "Coimriú Nua"
 
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"R-phost:\n"
+#~ msgid "(No name)"
+#~ msgstr "(gan ainm)"
 
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Am Críos: "
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Cruthaigh Cruinniú _Nua"
 
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ainm:  "
+#~ msgid "New Appointment"
+#~ msgstr "Coinne Nua"
 
-msgid "New _Contact"
-msgstr "_Tadhall Nua"
+#~ msgid "_Appointment..."
+#~ msgstr "_Coinne..."
 
-msgid "New _Task"
-msgstr "_Tasc Nua"
+#~ msgid "_Calendar Settings..."
+#~ msgstr "Álbachtaí _Féilire..."
 
-msgid "(Unknown)"
-msgstr "(Gan fhois)"
+#~ msgid "_Task..."
+#~ msgstr "_Tasc..."
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Cuardaigh"
+
+#~ msgid "Card: "
+#~ msgstr "Carta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ainm: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Clann:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Seoladh:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Bosca Phoist: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Stráid:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cathair:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cuige:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cód Phoist:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Tír:          "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gutháin:   \n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Guthán:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "R-phost:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Am Críos: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ainm:  "
+
+#~ msgid "New _Contact"
+#~ msgstr "_Tadhall Nua"
+
+#~ msgid "New _Task"
+#~ msgstr "_Tasc Nua"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(Gan fhois)"
 
-msgid "New _Mail Message"
-msgstr "Scéal_Post Nua"
+#~ msgid "New _Mail Message"
+#~ msgstr "Scéal_Post Nua"
 
-msgid "GnomeCard:"
-msgstr "GnomeCard: "
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard: "
 
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
 
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
 
-msgid "%d"
-msgstr "%d"
+#~ msgid "%d"
+#~ msgstr "%d"
 
-msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%a %d/%m/%Y"
 
-msgid "SASL"
-msgstr "SASL"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-msgid "URI"
-msgstr "URI"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-msgid "a"
-msgstr "a"
+#~ msgid "a"
+#~ msgstr "a"
 
-msgid "b"
-msgstr "b"
+#~ msgid "b"
+#~ msgstr "b"
 
-msgid "c"
-msgstr "c"
+#~ msgid "c"
+#~ msgstr "c"
 
-msgid "e"
-msgstr "e"
+#~ msgid "e"
+#~ msgstr "e"
 
-msgid "f"
-msgstr "f"
+#~ msgid "f"
+#~ msgstr "f"
 
-msgid "g"
-msgstr "g"
+#~ msgid "g"
+#~ msgstr "g"
 
-msgid "h"
-msgstr "h"
+#~ msgid "h"
+#~ msgstr "h"
 
-msgid "i"
-msgstr "i"
+#~ msgid "i"
+#~ msgstr "i"
 
-msgid "j"
-msgstr "j"
+#~ msgid "j"
+#~ msgstr "j"
 
-msgid "k"
-msgstr "k"
+#~ msgid "k"
+#~ msgstr "k"
 
-msgid "l"
-msgstr "l"
+#~ msgid "l"
+#~ msgstr "l"
 
-msgid "m"
-msgstr "m"
+#~ msgid "m"
+#~ msgstr "m"
 
-msgid "o"
-msgstr "o"
+#~ msgid "o"
+#~ msgstr "o"
 
-msgid "p"
-msgstr "p"
+#~ msgid "p"
+#~ msgstr "p"
 
-msgid "q"
-msgstr "q"
+#~ msgid "q"
+#~ msgstr "q"
 
-msgid "t"
-msgstr "t"
+#~ msgid "t"
+#~ msgstr "t"
 
-msgid "u"
-msgstr "u"
+#~ msgid "u"
+#~ msgstr "u"
 
-msgid "v"
-msgstr "v"
+#~ msgid "v"
+#~ msgstr "v"
 
-msgid "w"
-msgstr "w"
+#~ msgid "w"
+#~ msgstr "w"
 
-msgid "y"
-msgstr "y"
+#~ msgid "y"
+#~ msgstr "y"
 
-msgid "z"
-msgstr "z"
+#~ msgid "z"
+#~ msgstr "z"
 
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#~ msgid "%I:%M%p"
+#~ msgstr "%I:%M%p"
 
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
 
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
 
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
 
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
 
-msgid "View All"
-msgstr "Feach Gach Rud"
+#~ msgid "View All"
+#~ msgstr "Feach Gach Rud"
 
-msgid "_Day"
-msgstr "Lá"
+#~ msgid "_Day"
+#~ msgstr "Lá"
 
-msgid "About..."
-msgstr "Faoi..."
+#~ msgid "About..."
+#~ msgstr "Faoi..."
 
-msgid "Address _Book... (FIXME)"
-msgstr "Leabhair Sheolaidh"
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Leabhair Sheolaidh"
 
-msgid "C_lear"
-msgstr "_Bunaigh"
+#~ msgid "C_lear"
+#~ msgstr "_Bunaigh"
 
-msgid "Close this appointment"
-msgstr "Dún an coinne seo"
+#~ msgid "Close this appointment"
+#~ msgstr "Dún an coinne seo"
 
-msgid "Pre_vious"
-msgstr "_Riomh"
+#~ msgid "Pre_vious"
+#~ msgstr "_Riomh"
 
-msgid "_Note (FIXME)"
-msgstr "_Nota (FIXME)"
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (FIXME)"
 
-msgid "_Task (FIXME)"
-msgstr "_Tasc (FIXME)"
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tasc (FIXME)"
 
-msgid "Reply to all"
-msgstr "Freagrair do Gach rud"
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair do Gach rud"
 
-msgid "_Reply"
-msgstr "_Freagrair"
+#~ msgid "_Reply"
+#~ msgstr "_Freagrair"
 
-msgid "Save in _folder... (FIXME)"
-msgstr "Sábháil mar _fillteán (FIXME)"
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Sábháil mar _fillteán (FIXME)"
 
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
 
-msgid "New Contact _List"
-msgstr "_Líosta Tadhall Nua"
+#~ msgid "New Contact _List"
+#~ msgstr "_Líosta Tadhall Nua"
 
-msgid "Co_ntacts:"
-msgstr "_Tadhallaí"
+#~ msgid "Co_ntacts:"
+#~ msgstr "_Tadhallaí"
diff --git a/po/gl.po b/po/gl.po
index 1726dd209b..46173d39d4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -58,8 +58,7 @@ msgstr "Crear ou editar contas de correo e outras preferencias"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -107,20 +106,20 @@ msgstr "Fábrica para o compoñente de correo de Evolution."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -128,40 +127,40 @@ msgstr "Libro de Enderezos"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Novo Contacto:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crear unha nova lista de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -169,7 +168,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -177,33 +176,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 #, 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a información do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 #, 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Agardando..."
@@ -217,42 +216,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Examinando %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data na que se completa"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -260,7 +261,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -268,19 +269,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -289,7 +290,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -299,7 +300,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -311,7 +312,7 @@ msgstr ""
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -321,15 +322,15 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -337,16 +338,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "O URI que ha amosar a axenda"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -391,7 +397,7 @@ msgstr "Dete_ctar tipos soportados "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -425,20 +431,21 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Fontes do Libro de Enderezos"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Fontes do Libro de Enderezos"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Fontes do Libro de Enderezos"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "_Fontes do Libro de Enderezos..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
@@ -450,61 +457,62 @@ msgstr "Anónimo"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "B_uscar"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -514,33 +522,33 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Único"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Eliminada"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -551,7 +559,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -560,7 +568,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -568,42 +576,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Información da Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Conectando ao servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Conectando ao servidor..."
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -612,7 +621,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -620,7 +629,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -630,36 +639,37 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -669,7 +679,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -679,7 +689,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -687,29 +697,29 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -717,20 +727,20 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Amosar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -739,45 +749,45 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
@@ -909,7 +919,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1008,10 +1018,10 @@ msgstr "Ca_tegorías..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1064,16 +1074,16 @@ msgid "_Web page address:"
 msgstr "Enderezo da páxina _Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "_Enderezo:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2073,36 +2083,41 @@ msgid "AOL Instant Messenger"
 msgstr "Anterior Mensaxe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Enviar _Mensaxe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Engadir Servicio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
@@ -2110,39 +2125,42 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Nome de _Usuario:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Particular"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "Traballando"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2150,40 +2168,40 @@ msgstr ""
 msgid "Contact"
 msgstr "Contactos"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nome da Conta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2192,7 +2210,7 @@ msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2200,49 +2218,54 @@ msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Nome Completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2414,11 +2437,11 @@ msgid "Is New List"
 msgstr "Nova Lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
@@ -2515,13 +2538,13 @@ msgid "Email begins with"
 msgstr "remata en"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
@@ -2538,108 +2561,108 @@ msgid "Type"
 msgstr "Tipo:"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Libro de Enderezos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2648,8 +2671,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
@@ -2692,7 +2715,7 @@ 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:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -2755,7 +2778,7 @@ msgid "Nickname"
 msgstr "Alcume"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Nota"
 
@@ -2764,7 +2787,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organización"
 
@@ -2904,68 +2927,74 @@ msgstr "Eliminada"
 msgid "Has Cursor"
 msgstr "Ordeamento das tarefas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Traballando"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Estonia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Nada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Xeral"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "para sempre"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax Particular"
@@ -2975,8 +3004,8 @@ msgid "Success"
 msgstr "Éxito"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3008,7 +3037,7 @@ msgstr "Protocolo non soportado"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3031,7 +3060,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
-msgid "Addressbook does not exist"
+msgid "Address Book does not exist"
 msgstr "O cartafol `%s' non existe."
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3174,7 +3203,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Engadir un enderezo a un contacto existente \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Buscando no Libro de Enderezos..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3234,18 +3264,41 @@ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Asistente Importador de Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Compositor de correo de Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compositor de correo de Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Imprimi-los contactos seleccionados"
@@ -3338,7 +3391,7 @@ msgstr "Marxes"
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcións"
 
@@ -3526,8 +3579,8 @@ msgstr "Non se especificou un nome de cartafol"
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Contrasinal"
@@ -3616,10 +3669,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -3667,26 +3719,24 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Abrir"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3695,12 +3745,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3708,7 +3758,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3719,20 +3769,20 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacións de alarma"
 
@@ -3879,24 +3929,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Axenda"
 
@@ -3929,7 +3985,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3951,81 +4007,81 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuración da Fonte de Novas"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4166,7 +4222,7 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4240,7 +4296,7 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -4251,7 +4307,7 @@ msgstr "comezo da cita"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Activado"
 
@@ -4303,7 +4359,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarmas"
@@ -4329,7 +4385,7 @@ msgid "Days"
 msgstr "Días"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_ctivar"
 
@@ -4475,7 +4531,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Xeral"
 
@@ -4572,7 +4628,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de _Tarefas"
@@ -4722,23 +4778,23 @@ msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Pendente "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Pendente "
 
@@ -4775,8 +4831,8 @@ msgstr "Entrada de diario - %s"
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Gardar como..."
 
@@ -4805,11 +4861,21 @@ msgstr "Cancelar Operación"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Axenda"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Lista de _Tarefas"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4917,7 +4983,7 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Cita"
 
@@ -4942,25 +5008,33 @@ msgstr "_Programar Xuntanza"
 msgid "Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Permiso denegado"
@@ -5043,30 +5117,30 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -5269,7 +5343,7 @@ msgstr "no"
 msgid "occurrences"
 msgstr "ocorrencias"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Hora:"
@@ -5306,7 +5380,7 @@ msgid "_No recurrence"
 msgstr "Se_n recorrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Elimina_r"
 
@@ -5349,7 +5423,7 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5376,7 +5450,7 @@ msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Completada "
@@ -5390,7 +5464,7 @@ msgstr "% Completo"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Completada"
 
@@ -5403,7 +5477,7 @@ msgstr "Alta"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "En Progreso"
 
@@ -5422,7 +5496,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -5464,16 +5538,16 @@ msgstr "Básico"
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non se pode abrir o libro de enderezos"
@@ -5484,7 +5558,7 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -5678,11 +5752,10 @@ msgstr "Data de _Inicio:"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr " cor"
@@ -5709,7 +5782,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5744,10 +5817,10 @@ msgstr "Non"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Descoñecido"
@@ -5760,103 +5833,109 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Abrir"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Preferencias de Correo..."
@@ -5949,7 +6028,7 @@ msgid "Alarms"
 msgstr "Alarmas"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Completo"
 
@@ -6007,26 +6086,26 @@ msgstr "%02i divisións de minuto"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6230,7 +6309,7 @@ msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6696,12 +6775,12 @@ msgstr "_Prioridade:"
 msgid "Web Page:"
 msgstr "Páxina"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Prema para engadir unha tarefa"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6709,7 +6788,7 @@ msgid ""
 msgstr "Erro ao iniciar %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6717,44 +6796,54 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Cargar _Imaxes"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Non hai citas"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6882,16 +6971,16 @@ msgstr "Información de Libre/Ocupado"
 msgid "iCalendar information"
 msgstr "información de axenda"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6899,7 +6988,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6907,12 +6996,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7101,53 +7190,53 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 #, fuzzy
 msgid "Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "E_stado:"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioridade:"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Categorías: "
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 #, fuzzy
 msgid "Contacts: "
 msgstr "Co_ntactos:"
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
@@ -7156,40 +7245,40 @@ msgstr "Configuración da Impresión"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7252,22 +7341,22 @@ msgstr "Mensaxe da Axenda"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Cartafol que contén citas e eventos"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7276,7 +7365,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
@@ -9049,7 +9138,7 @@ msgstr "Non se pode abrir a mensaxe"
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
@@ -9144,7 +9233,7 @@ msgstr "Copiando as mensaxes a %s"
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9152,47 +9241,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:814
-#, fuzzy
-msgid "No data provided"
-msgstr "Non se especificou un nome de cartafol"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 #, 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:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9200,61 +9284,61 @@ msgid ""
 "%s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mensaxe cifrada"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Non foi posible recibir a mensaxe do editor"
@@ -9368,22 +9452,35 @@ msgstr ""
 msgid "parse error"
 msgstr "Outro erro"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Fornecedor de correo do cartafol virtual"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Para ler correo coma unha petición de outro conxunto de cartafoles"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Non foi posible cargar %s: Non se soporta a carga de módulos neste sistema."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai código de inicialización no módulo."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anónimo"
@@ -9535,7 +9632,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -9674,20 +9771,7 @@ msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 msgid "Host lookup failed: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo descoñecido"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Fornecedor de correo do cartafol virtual"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para ler correo coma unha petición de outro conxunto de cartafoles"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9758,24 +9842,28 @@ msgstr "Tipo de Servidor: "
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/camel-store.c:297
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -10006,23 +10094,33 @@ msgstr "Non existe a mensaxe %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Non pode copiar mensaxes deste cartafol de lixo."
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -10039,16 +10137,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Libro de Enderezos"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -10068,70 +10161,67 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Contrasinal"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
+#: camel/providers/groupwise/camel-gw-listener.c:323
 #, fuzzy
-msgid "Default"
-msgstr "Por de_fecto"
+msgid "Checklist"
+msgstr "Brétema espesa"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de máis."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
@@ -10146,7 +10236,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "O cartafol foi destruido e rexenerado no servidor."
 
@@ -10155,12 +10245,12 @@ msgstr "O cartafol foi destruido e rexenerado no servidor."
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10176,25 +10266,25 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo información de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -10255,27 +10345,37 @@ msgstr "Espacio de nomes"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio %s para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10284,68 +10384,68 @@ msgstr "Servicio %s para %s en %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10356,24 +10456,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "O nome do cartafol non pode conter o carácter Return."
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -10395,7 +10503,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Non foi posible conectarse ó servidor POP en %s."
@@ -10481,8 +10589,8 @@ 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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10494,55 +10602,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non teñen un inbox"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resumo: motivo descoñecido"
 
@@ -10561,53 +10669,44 @@ msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non válido"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Non é posible abrir o cartafol `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear o cartafol `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10631,9 +10730,9 @@ msgid "Checking for new messages"
 msgstr "Buscando mensaxes novas"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
@@ -10679,110 +10778,88 @@ msgstr "O cartafol parece estar corrompido sen recuperación posible."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear o directorio %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Ese non é un ficheiro normal."
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Non foi posible crear o ficheiro `%s':\n"
+"Non foi posible borrar o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non é un ficheiro normal."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible borrar o cartafol `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "O cartafol `%s' non está baleiro. Non borrado."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de cartafol indicado non é válido: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Non é posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erro grave do analizador de correo preto da posición %ld no cartafol %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -10790,53 +10867,53 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e o cartafol non concordan, mesmo logo de sincronizar"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escribir á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s: %s"
@@ -10851,10 +10928,17 @@ msgstr "Enviar mensaxe a un contacto"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Non foi posible crear o cartafol `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' non é un directorio."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Non é posible obter o cartafol: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10876,6 +10960,29 @@ msgstr "O raíz de armacenamento %s non é un directorio normal."
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non existe."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Non é posible abrir o cartafol `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "O cartafol `%s' non existe."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible crear o cartafol `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
@@ -11111,48 +11218,48 @@ msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 #, fuzzy
 msgid "Use cancel"
 msgstr "Cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Operación cancelada"
@@ -11200,7 +11307,7 @@ msgstr "Borrar despois de %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11291,7 +11398,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11347,7 +11454,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11525,7 +11632,7 @@ msgstr "Entrega de correo SMTP vía %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non válido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -11638,34 +11745,34 @@ msgstr "A petición AUTH expirou: %s"
 msgid "QUIT response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro á mensaxe"
 
@@ -11790,20 +11897,20 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11812,30 +11919,30 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, ¿sobrescribir?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11844,7 +11951,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11853,7 +11960,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11862,7 +11969,7 @@ msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11871,7 +11978,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11880,7 +11987,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesión anterior.\n"
 "¿Gostaríalle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11891,51 +11998,51 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11946,7 +12053,7 @@ 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:3201
+#: composer/e-msg-composer.c:3216
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11955,7 +12062,7 @@ 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:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12323,7 +12430,7 @@ msgstr "Entón"
 msgid "You must specify a folder."
 msgstr "Nome do estilo:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
@@ -12338,20 +12445,20 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
 msgstr "despois"
@@ -12446,7 +12553,7 @@ msgstr ""
 "A data da mensaxe hase comparar co momento\n"
 "que especifique aquí."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Cartafoles Virtuais"
 
@@ -12462,7 +12569,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segundos"
 
@@ -12640,7 +12747,7 @@ msgstr "Marcada"
 msgid "Junk Test"
 msgstr "xuño"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12754,9 +12861,10 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Asunto"
 
@@ -12765,25 +12873,25 @@ msgstr "Asunto"
 msgid "Unset Status"
 msgstr "Establecer Estado"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Nome da regra: "
@@ -12824,17 +12932,17 @@ msgstr "O asunto contén"
 msgid "Subject does not contain"
 msgstr "O asunto non contén"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
@@ -12893,9 +13001,9 @@ msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Correo"
 
@@ -12904,7 +13012,7 @@ msgstr "Correo"
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferencias da Axenda"
@@ -12949,17 +13057,17 @@ msgstr "Nome do estilo:"
 msgid "[script]"
 msgstr "descrición"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Idioma"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 #, fuzzy
 msgid "Add script signature"
 msgstr "Engadir criterio"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
@@ -13046,7 +13154,6 @@ msgid "Unread messages"
 msgstr "Seguinte Mensaxe Sen Ler"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
@@ -13055,412 +13162,434 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Entrada"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, fuzzy, c-format
 msgid "%s"
 msgstr "s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Elimina-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Eliminar"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Non foi posible renomear o cartafol %s a %s: %s"
+
+#: mail/em-folder-tree.c:2153
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default"
+msgstr "Por de_fecto"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Prema para engadir unha tarefa"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Aparicións:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Asignada"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Indefinida"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Cifrar con PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID do certificado:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Inline"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Agochar"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
@@ -13504,30 +13633,35 @@ msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13544,8 +13678,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13563,21 +13697,26 @@ msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "O usuario cancelou a operación."
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Non se puido verifica-los certificados."
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13589,61 +13728,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mensaxes Sen Título"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -13693,18 +13832,18 @@ msgstr "Filtros"
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13713,7 +13852,7 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13722,32 +13861,38 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "_Enderezo:"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mensaxe de %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13760,7 +13905,7 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13788,320 +13933,328 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Borrar esta mensaxe"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Borrar esta mensaxe"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Borrar esta mensaxe"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Borrar esta mensaxe"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "O estilo de Remitir por defecto é: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Trocar a mostra da barra de cartafoles"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Enviar a mensaxe máis tarde"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Contas"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, 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:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Enviar as mensaxes en formato HTML por defecto."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Enviar as mensaxes en formato HTML por defecto."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Panel de Previsualización"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Contacto Orixinal:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -14109,177 +14262,174 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Lista de Mensaxes por Fíos"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Lista de Mensaxes por Fíos"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Mensaxe remitida (sen asunto)"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Variable"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importar"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando o seu correo de Elm antigo"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importando %s coma %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Examinando %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importando Datos"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -14287,16 +14437,44 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Elm.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Borrar este cartafol"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importando"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importando"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Examinando %s"
+
+#: mail/importers/netscape-importer.c:72
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "_Prioridade:"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14311,7 +14489,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14319,7 +14497,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14328,33 +14506,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#: mail/importers/netscape-importer.c:1995
+#: mail/importers/netscape-importer.c:1677
 #, fuzzy
-msgid "Scanning mail filters"
-msgstr "Ficheiro local de correo %s"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Explorando o directorio"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Comezando a importación"
+msgid "Importing Netscape data"
+msgstr "Importando Datos"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Opcións"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14362,12 +14532,21 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 #, fuzzy
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution está importando os seus datos de Pine antigos"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importando Datos"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Libro de Enderezos"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14375,7 +14554,7 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "¿Gostaríalle importalos a Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 #, fuzzy
 msgid "Pine"
 msgstr "Imprimir"
@@ -14421,20 +14600,20 @@ msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Ruta:"
 
@@ -14483,29 +14662,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Novo CartafolV"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Editar Filtros"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Crear unha nova mensaxe"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14554,7 +14748,7 @@ msgstr ""
 "está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Xestión de Contas"
 
@@ -14584,133 +14778,129 @@ msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non está soportado nesta versión de evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non está soportado nesta versión de evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Información de Contas"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Engadir criterio"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar un ficheiro á mensaxe"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Xogo de caracteres descoñecido: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "P_echar"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14727,347 +14917,343 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificación de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo contén"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar accións"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Opcións"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Cabeceira"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Gardar e Pechar"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Localización da caixa do correo"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "A mensaxe contén"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Información Opcional"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opcións de Recepción"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Información Requirida"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticación"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15078,201 +15264,201 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de Autenticación: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "xuño"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imaxes se o autor está no libro de enderezos"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Eliminar..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "San Marino"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Contacto Orixinal:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexión segura (_SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
@@ -15295,7 +15481,7 @@ msgstr ""
 "Erro ao efectuar a operación:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Traballando"
 
@@ -15307,128 +15493,128 @@ msgstr "Filtrando o Cartafol"
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15437,7 +15623,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15446,11 +15632,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15459,22 +15645,22 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15509,40 +15695,40 @@ msgstr "Excepcións"
 msgid "Security Information"
 msgstr "Información da Fonte"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Agardando..."
 
@@ -15652,22 +15838,22 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
@@ -16013,101 +16199,20 @@ msgstr "Cartafoles Especiais"
 msgid "Autocompletion Folders"
 msgstr "Data na que se completa"
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Non se pode mover un cartafol a si mesmo."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Non se pode copiar un cartafol a si mesmo."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Non se pode mover un cartafol a un dos seus descendentes"
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Indique un cartafol no que copia-lo cartafol \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Copiar cartafol"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Indique un cartafol no que move-lo cartafol \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Mover cartafol"
-
-#: shell/e-shell-folder-commands.c:391
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Elimina-lo cartafol '%s'"
-
-#: shell/e-shell-folder-commands.c:489
-#, fuzzy, c-format
-msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
+"Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "O nome de cartafol indicado non é válido: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Non se pode crear o cartafol indicado:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sen_título)"
@@ -16248,7 +16353,7 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
@@ -16292,6 +16397,10 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Comezando a importación"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16405,130 +16514,6 @@ msgstr "Non se atopou a Base de Datos de configuracións"
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Crear un novo grupo de atallos"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nome do grupo:"
-
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"¿Realmente desexa eliminar o grupo\n"
-"`%s' da barra de atallos?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Renomear Grupo de Atallos"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Renomear o grupo de atallos seleccionado a:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Iconas _Pequenas"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Amosar os atallos como iconas pequenas"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Iconas _Grandes"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Amosar os atallos como iconas grandes"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "_Novo Grupo..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Crear un novo grupo de atallos"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Eliminar este Grupo..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Eliminar este grupo de atallos"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Re_nomear este Grupo..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Renomear este grupo de atallos"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Agochar a Barra de _Atallos"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Agochar a barra de atallos"
-
-#: shell/e-shortcuts-view.c:288
-#, fuzzy
-msgid "Create _Default Shortcuts"
-msgstr "Crear un novo atallo"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "Create Default Shortcuts"
-msgstr "Crear un novo atallo"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Renomear atallo"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Renomea-lo atallo seleccionado a:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Abrir o cartafol ligado a este atallo"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Abrir nunha Nova _Fiestra"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Abri-lo cartafol ligado a este atallo nunha nova fiestra"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Renomear este atallo"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Eli_minar"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Eliminar este atallo da barra de atallos"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Erro ao gardar os atallos."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Atallos"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -16540,11 +16525,6 @@ msgstr "Chile"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Abrir en %s..."
-
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -16838,50 +16818,50 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Seleccionar Cartafol"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "En Progreso"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Expresión"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Enderezo de Correo:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ID do certificado:"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduza o seu contrasinal para %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
@@ -16890,7 +16870,7 @@ msgstr ""
 "Expendedor: %s\n"
 "Asunto: %s"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -16959,7 +16939,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "ID do certificado:"
@@ -17035,11 +17015,11 @@ msgstr "Organización"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -17087,242 +17067,242 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr ", "
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "Aceptar"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Clave Pública: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "O asunto é %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Non se puido verifica-los certificados."
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Opcións"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Sen Información"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "anexo"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Croacia"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Croacia"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Expresión"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "Servidor %s %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Ficheiro de sinatura:"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Inserir"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "O asunto é %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Ficheiro de sinatura:"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "ID do certificado:"
@@ -17948,7 +17928,7 @@ msgstr "Lis_ta de Mensaxes por Fíos"
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "A_dd Sender to Addressbook"
+msgid "A_dd Sender to Address Book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17958,7 +17938,7 @@ msgstr "Aplicar Filtros"
 
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
-msgid "Add Sender to Addressbook"
+msgid "Add Sender to Address Book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18437,10 +18417,6 @@ msgstr "Formato"
 msgid "HT_ML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Abrir un ficheiro"
@@ -18828,22 +18804,6 @@ msgstr "_Enviar / Recibir"
 msgid "_Window"
 msgstr "Buscar Agora"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimir Resumo"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Imprimir resumo"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Recargar"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Recargar a vista"
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -18918,8 +18878,8 @@ msgstr "Coa Categoría"
 msgid "_Tasks"
 msgstr "_Tarefa"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr ""
 
@@ -19175,26 +19135,26 @@ msgstr "_Buscar"
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Item ID"
 msgstr "_Elemento (AMÁÑAME)"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 #, fuzzy
 msgid "Text"
 msgstr "Proba"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Buscar Agora"
@@ -19209,6 +19169,219 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Fontes do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "No data provided"
+#~ msgstr "Non se especificou un nome de cartafol"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible crear o directorio %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible crear o ficheiro `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' non é un directorio."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importando %s coma %s"
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "Ficheiro local de correo %s"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Explorando o directorio"
+
+#, fuzzy
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Non é posible obter o cartafol: %s: %s"
+
+#, fuzzy
+#~ msgid "Cannot move folder: %s"
+#~ msgstr ""
+#~ "Non foi posible borrar o cartafol:\n"
+#~ "%s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Non se pode mover un cartafol a si mesmo."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Non se pode copiar un cartafol a si mesmo."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Non se pode mover un cartafol a un dos seus descendentes"
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Indique un cartafol no que copia-lo cartafol \"%s\":"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Copiar cartafol"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Indique un cartafol no que move-lo cartafol \"%s\":"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Mover cartafol"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible borrar o cartafol:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Elimina-lo cartafol '%s'"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible borrar o cartafol:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible borrar o cartafol:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Crear un novo grupo de atallos"
+
+#~ msgid "Group name:"
+#~ msgstr "Nome do grupo:"
+
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "¿Realmente desexa eliminar o grupo\n"
+#~ "`%s' da barra de atallos?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Renomear Grupo de Atallos"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Renomear o grupo de atallos seleccionado a:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Iconas _Pequenas"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Amosar os atallos como iconas pequenas"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Iconas _Grandes"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Amosar os atallos como iconas grandes"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "_Novo Grupo..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Crear un novo grupo de atallos"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Eliminar este Grupo..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Eliminar este grupo de atallos"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Re_nomear este Grupo..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Renomear este grupo de atallos"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Agochar a Barra de _Atallos"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Agochar a barra de atallos"
+
+#, fuzzy
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Crear un novo atallo"
+
+#, fuzzy
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Crear un novo atallo"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Renomear atallo"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Renomea-lo atallo seleccionado a:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Abrir o cartafol ligado a este atallo"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Abrir nunha Nova _Fiestra"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Abri-lo cartafol ligado a este atallo nunha nova fiestra"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Renomear este atallo"
+
+#~ msgid "Re_move"
+#~ msgstr "Eli_minar"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Eliminar este atallo da barra de atallos"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Erro ao gardar os atallos."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Atallos"
+
+#, fuzzy
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "Abrir en %s..."
+
+#~ msgid "Print Summary"
+#~ msgstr "Imprimir Resumo"
+
+#~ msgid "Print summary"
+#~ msgstr "Imprimir resumo"
+
+#~ msgid "Reload"
+#~ msgstr "Recargar"
+
+#~ msgid "Reload the view"
+#~ msgstr "Recargar a vista"
+
 #, fuzzy
 #~ msgid "Copy to folder..."
 #~ msgstr "_Copiar a un Cartafol..."
@@ -19852,22 +20025,10 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Outro Enderezo"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Asistente Importador de Evolution"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Asistente Importador de Evolution"
 
 #, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Compositor de correo de Evolution."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Compositor de correo de Evolution."
-
-#, fuzzy
 #~ msgid "Searching..."
 #~ msgstr "Buscar M_ensaxe..."
 
@@ -24811,10 +24972,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Citas"
 
 #, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Non hai citas"
-
-#, fuzzy
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%A, %d de %B"
 
@@ -25325,9 +25482,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Moderate mist"
 #~ msgstr "Brétema moderada"
 
-#~ msgid "Thick mist"
-#~ msgstr "Brétema espesa"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Brétema pouco intensa"
 
@@ -25845,9 +25999,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Crear un novo cartafol"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Borrar este cartafol"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Amosar un cartafol diferente"
 
@@ -27401,9 +27552,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "First Run Setup Assistant"
 #~ msgstr "Asistente de Configuración na Primeira Execución"
 
-#~ msgid "Importing Data"
-#~ msgstr "Importando Datos"
-
 #~ msgid "Setup Assistant"
 #~ msgstr "Asistente de Configuración"
 
@@ -28243,9 +28391,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Add a new service to the Executive Summary"
 #~ msgstr "Engadir un novo servicio ao Resumo Executivo"
 
-#~ msgid "Create a new email"
-#~ msgstr "Crear unha nova mensaxe"
-
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
 
diff --git a/po/hr.po b/po/hr.po
index a5b205fe3b..a716c0c7a7 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-01 16:52+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -45,8 +45,7 @@ msgstr "Ovdje podesite automatsko nadopunjavanje"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -86,19 +85,20 @@ msgstr "Kontrola podešavanja postavki Evolucija direktorija"
 msgid "Manager your S/Mime certificates here"
 msgstr "Upravljanje vašim S/Mime certifikatima"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, 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-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -106,65 +106,65 @@ msgstr "Novi adresar"
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Postavke..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nova lista kontakata"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Kontakt _lista"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Napravi novi kontakt popis"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Neuspjela prijava na LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Nisam mogao obaviti upit na Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Server je odgovorio nepodržanim bazama za pretragu"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Greška kod čitanja podataka sheme"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migriranje..."
 
@@ -181,40 +181,42 @@ msgstr ""
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migriram `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Na ovom računalu"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Osobni podaci"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Na LDAP poslužiteljima"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "Mijenjaj LDAP poslužitelje"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Automatsko dovršavanje"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -226,7 +228,7 @@ msgstr ""
 "Molim da preciznije oblikujete upit ili povećate limit\n"
 "broja rezultata u podešavanjima adresara za server direktorija."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -240,19 +242,19 @@ msgstr ""
 "direktorija\n"
 "za ovaj adresar."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspješno završen."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -260,7 +262,7 @@ msgstr ""
 "Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
 "dozvole pristupiti joj."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -268,7 +270,7 @@ msgstr ""
 "Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
 "URI, ili je LDAP poslužitelj nedostupan."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -278,7 +280,7 @@ msgstr ""
 "koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
 "nakon što skinete OpenLDAP sa donjeg linka."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -286,27 +288,32 @@ msgstr ""
 "Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
 "URI, ili je poslužitelj nedostupan"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Ne mogu otvoriti adresar"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID izvora kontakata koje će pregled ispisati"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI koju će kalendar pokazati"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList xml za popis adresa koje se nadopunjavaju"
@@ -352,7 +359,7 @@ msgstr " P_rikaži podržane baze "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -384,19 +391,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Pomoćnik za stvaranje adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Svojstva adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Izvori adresara"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Podešavanja adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Uvijek"
 
@@ -405,56 +415,62 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
+"Čestitamo, završili ste s postavljanjem kalendara.\n"
+"\n"
+"Molim kliknite gumb \"Primjeni\" kako biste spremili postavke koje ste ovdje "
+"unijeli."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Završeno"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Općenito"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -470,23 +486,23 @@ msgstr ""
 "veze. Pitajte svog administratora sustava koristi li vaš LDAP poslužitelj "
 "ove protokole."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jedan"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Ops_eg pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Pretraživanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Označeno"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -496,7 +512,7 @@ msgstr ""
 "akoi\n"
 "on podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -512,7 +528,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:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -524,7 +540,7 @@ 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:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -535,39 +551,41 @@ msgstr ""
 "postavkiLDAP\n"
 "Evolution pretraživanja i  upisivanja i mijenjanja kontakata. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Određivanje prikazanog imena i grupe je prvi korak u podešavanju adresara."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Korak 1: Svojstva mape"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Korak 2: Poslužitelj podataka"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Korak 3: Spajanje na poslužitelj"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Korak 4: Pretraživanje direktorija"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -580,7 +598,7 @@ msgstr ""
 "pretraga uzima vremena. Kontaktirajte vašeg sistem administratora \n"
 "za promijenu ovih opcija."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -591,7 +609,7 @@ msgstr ""
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korijena stabla "
 "direktorija."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -605,11 +623,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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -619,22 +639,23 @@ msgstr ""
 "Molim kontaktirajte administratora vašeg sustava ako trebate pomoć\n"
 "u pronalaženju tih podataka."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Najveći broj unosa za preuzimanje. Ako unesete preveliki \n"
 "broj, vaš će se adresar usporiti."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -643,7 +664,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -652,7 +673,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -661,7 +682,7 @@ msgstr ""
 "Ovo je ime koje će se prikazati u list mapa Evolutiona. Ovo je samo za "
 "potrebe prikaza."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -672,28 +693,28 @@ msgstr ""
 "Ponuđen je popis standardnih portova. Pitajte svog administratora\n"
 "koji port da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "K_oristi SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Koristim adresu elektronske pošte"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -705,19 +726,19 @@ msgstr ""
 "vašeg sustava\n"
 "ako ne znate ove podatke."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -726,39 +747,39 @@ msgstr "Limit za _preuzimanje:"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Metoda _prijave: "
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "Broj _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Ime poslužitelja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Odziv (minute):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "tab za vezu"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "tab za opće podatke"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "tab za pretragu"
 
@@ -873,7 +894,7 @@ msgstr "Suradnja"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -967,10 +988,10 @@ msgstr "_Kategorije..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1018,15 +1039,15 @@ msgid "_Web page address:"
 msgstr "Adresa _stranice na Internetu:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2010,102 +2031,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Servis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Lokacija"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Polazno"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Posao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Ostalo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Ime računa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Spremi kontakt kao VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2113,7 +2143,7 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2121,46 +2151,51 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ovaj kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Posao"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Puno ime:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
@@ -2316,11 +2351,11 @@ msgid "Is New List"
 msgstr "Je li novi popis"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Spremi popis kao VCard"
 
@@ -2409,13 +2444,13 @@ msgid "Email begins with"
 msgstr "Poruka počinje sa"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
@@ -2432,101 +2467,100 @@ msgid "Type"
 msgstr "Tip"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spremi kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Novi kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Idi u mapu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Podešavanja adresara"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosljedi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Ispis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Ispiši omotnicu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2539,8 +2573,8 @@ msgstr ""
 "koristite"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
@@ -2583,7 +2617,7 @@ msgid "Company Phone"
 msgstr "Telefon poduzeća"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-pošta"
 
@@ -2642,7 +2676,7 @@ msgid "Nickname"
 msgstr "Nadimak"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Bilješka"
 
@@ -2651,7 +2685,7 @@ msgid "Office"
 msgstr "Ured"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -2777,67 +2811,73 @@ msgstr "Odabrano"
 msgid "Has Cursor"
 msgstr "Sadrži Pokazivač"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Popis članova"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Posao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Opis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Adresa za video konferenciju:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Telefon (u autu)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Osobni podaci"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Poslovna titula"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Početna stranica"
 
@@ -2846,8 +2886,8 @@ msgid "Success"
 msgstr "Uspjeh"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2877,7 +2917,7 @@ msgstr "Protokol nije podržan"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2897,7 +2937,8 @@ msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3032,7 +3073,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adresu postojećim kontaktima \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Pretražujem adresar..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3087,17 +3129,40 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Ovo bi trebalo testirati element toka platna"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm uvoznik"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar uvoznik"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar uvoznik"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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 "Ispis koverte "
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Ispiši kontakte"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Ispiši kontakt"
 
@@ -3189,7 +3254,7 @@ msgstr "Margine"
 msgid "Number of columns:"
 msgstr "Broj stupaca:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Odrednice"
 
@@ -3369,8 +3434,8 @@ msgstr "Ime datoteke nije dano"
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
@@ -3447,10 +3512,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponenta zadataka Evolutiona"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Zadaci"
 
@@ -3494,26 +3558,26 @@ msgstr "Vrijeme drijemanja (u minutama)"
 msgid "_Edit appointment"
 msgstr "_Promijeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Otvori"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Otvori"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "_Odbaci"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "Otpusti _sve"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Opis ne postoji."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3526,12 +3590,12 @@ msgstr ""
 "Počinje u %s\n"
 "Završava u %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3543,7 +3607,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3560,19 +3624,19 @@ msgstr ""
 "\n"
 "Sigurno želite pokrenite ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu aplikaciju."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Ne mogu inicijalizirati Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne mogu pokrenuti gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao pokrenuti stvaranje servisa za alarm obavijesti"
 
@@ -3708,24 +3772,30 @@ msgstr "Treba li prikazivati vrijeme u 24 satnom obliku umjesto am/pm formata"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Treba li prikazivati brojeve tjedana u navigatoru datumima"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Neupariv"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3754,7 +3824,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3776,70 +3846,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Obveza"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "_Kalendar"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, 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:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za stvaranje događaja i sastanaka"
 
@@ -3971,7 +4041,7 @@ msgstr "sati"
 msgid "minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Akcija/okidač"
 
@@ -4043,7 +4113,7 @@ msgid "hour(s)"
 msgstr "sat(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuta(e)"
 
@@ -4054,7 +4124,7 @@ msgstr "početak zakazanog sastanka"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Omogućeno"
 
@@ -4104,7 +4174,7 @@ msgstr "30 minuta"
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Uzbune"
 
@@ -4129,7 +4199,7 @@ msgid "Days"
 msgstr "dani"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Omogući"
 
@@ -4269,7 +4339,7 @@ msgid "_Fri"
 msgstr "_Pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Općenito"
 
@@ -4368,7 +4438,7 @@ msgstr ""
 "unijeli."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Novi popis zadataka"
 
@@ -4533,23 +4603,23 @@ msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređivač?"
 msgid "Validation error: %s"
 msgstr "Greška pri provjeri: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr "do"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr "(Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Završeno "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Due "
 
@@ -4585,8 +4655,8 @@ msgstr "Stavka dnevnika - %s"
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Spremi kao..."
 
@@ -4615,10 +4685,21 @@ msgstr "Odredište slanja"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Izaberite "
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendar"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Novi popis zadataka"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4721,7 +4802,7 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Obveza"
 
@@ -4745,23 +4826,32 @@ msgstr "Raspored"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Datum isteka je prije datuma početka!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Završni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Početno vrijeme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
@@ -4837,29 +4927,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nijedan"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Odabrani organizator više nema račun."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Nužna je najmanje jedna prisutna osoba."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
@@ -5045,7 +5135,7 @@ msgstr "na"
 msgid "occurrences"
 msgstr "ponavljanja"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Datum/vrijeme"
 
@@ -5078,7 +5168,7 @@ msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -5120,7 +5210,7 @@ msgstr ""
 "\n"
 "Želite li spremiti izmjene?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Zanemari promjene"
 
@@ -5145,7 +5235,7 @@ msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Informacija o zadatku je promijenjena. Želite li poslati ažuriranu inačicu?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
@@ -5158,7 +5248,7 @@ msgstr "% _ dovršeno"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Završeno"
 
@@ -5171,7 +5261,7 @@ msgstr "Visok"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Izvodi se"
 
@@ -5190,7 +5280,7 @@ msgstr "Obično"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nije započelo"
 
@@ -5229,16 +5319,16 @@ msgstr "Osnovno"
 msgid "Assignment"
 msgstr "Dodjela"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Datum isteka je prije datuma početka!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
@@ -5249,7 +5339,7 @@ msgstr "_Povjerljivo"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5433,11 +5523,10 @@ msgstr "Datum početka"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sažetak"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "boja"
 
@@ -5462,7 +5551,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5497,10 +5586,10 @@ msgstr "Ne"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Napoznato"
@@ -5513,99 +5602,105 @@ msgstr "Ponavljajući"
 msgid "Assigned"
 msgstr "Dodijeljeno"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Ispis..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Zaljepi"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Idi na Danas"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Otvori"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Spremi Kao..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Postavke..."
 
@@ -5692,7 +5787,7 @@ msgid "Alarms"
 msgstr "Alarmi"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Završi"
 
@@ -5750,26 +5845,26 @@ msgstr "razmaci od %02i minuta"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5951,7 +6046,7 @@ msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
@@ -6405,12 +6500,12 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Internet stranica"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6420,7 +6515,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6428,12 +6523,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6442,28 +6537,38 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Učitavanje zadataka"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Učitavanje zadataka"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Zakazani sastanak - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvori u %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6582,16 +6687,16 @@ msgstr "Slobodan/zauzet informacija (%s do %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informacije"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Morate biti sudionik događaja"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6599,7 +6704,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6607,12 +6712,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Rođendani i obljetnice"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Na webu"
 
@@ -6801,49 +6906,49 @@ msgstr "Odabran mjesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Odabrana godina (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Zadatak"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s "
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Konatkti: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Pogled prije ispisa"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Ispiši stavku"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Podešavanje ispisa"
 
@@ -6853,37 +6958,37 @@ 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:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Novi popis zadataka"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Lista zadataka"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Stvori novi popis zadataka"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, 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:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za stvaranje zadataka"
 
@@ -6940,20 +7045,20 @@ msgstr "iCalendar datoteke (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar datoteke (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Izbriši stare dogovore i sastanke"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Podsjetnik!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalendarski događaji"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6961,7 +7066,7 @@ msgstr ""
 "Evolution je pronašao datoteke GNOME kalendara.\n"
 "Želite li ih uvesti u Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -8623,7 +8728,7 @@ msgstr "Ne mogu otvoriti poruku"
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Sinkroniziram mapu"
 
@@ -8708,7 +8813,7 @@ msgstr "Kopiram poruke"
 msgid "Filtering new message(s)"
 msgstr "Filtriranje novih poruka"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8719,15 +8824,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao pročitati gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8736,30 +8841,26 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\"3+"
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nisam dobio podatke"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji. "
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8770,59 +8871,59 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao primjeniti GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao izvršiti gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Nisam mogao izvršiti gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Dio poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno kriptirani dio poruke"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Kriptirani sadržaj"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Nije moguća analiza sadržaja poruke"
 
@@ -8934,21 +9035,34 @@ msgstr "Neuspješno dekodiran MIME dio: neispravna struktura"
 msgid "parse error"
 msgstr "greška pri parsiranju"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Ponuđač elktronske pošte sa virtualnim direktorijom"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Za čitanje pošte kao upita drugog niza mapa"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ne mogu učitati %s: ovaj sustav ne podržava učitavanje modula."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ne mogu učitati %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu učitati %s: nema koda za pokretanje u modulu."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Nema dostupnog ponuđača za protokol `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimno"
@@ -9107,7 +9221,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Neispravan odgovor autentifikacije od servera."
 
@@ -9242,20 +9356,7 @@ msgstr "Neuspjelo nalaženje domaćina: domaćin nije pronađen"
 msgid "Host lookup failed: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: nepoznat razlog"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Ponuđač elktronske pošte sa virtualnim direktorijom"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Za čitanje pošte kao upita drugog niza mapa"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Nema dostupnog ponuđača za protokol `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9318,21 +9419,25 @@ msgstr "Potpisao: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu dobiti mapu: neispravna operacija"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Ne mogu stvoriti mapu: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Smeće"
@@ -9564,21 +9669,31 @@ msgstr "Nema takve poruke %s u %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Ne možete kopirati poruke iz NNTP mape!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Ne možete kopirati poruke iz NNTP mape!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9594,14 +9709,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Primjeni filtere na nove poruke u Inbox mapi ovog poslužitelja"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatska sinhronizacija udaljenje pošte s lokalnom"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Adresar"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "LDAP ime poslužitelja:"
@@ -9619,42 +9730,40 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Lozinka"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Uobičajeno"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "popis"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9663,26 +9772,26 @@ msgstr ""
 "Upozorenje od IMAP servera %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP naredba nije uspjela: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Odgovor poslužitelja je prerano završen."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor IMAP poslužitelja ne sadrži %s informaciju"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočekivan OK odgovor od IMAP poslužitelja: %s"
@@ -9697,7 +9806,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je uništena i ponovo kreirana na serveru."
 
@@ -9706,12 +9815,12 @@ msgstr "Mapa je uništena i ponovo kreirana na serveru."
 msgid "Scanning for changed messages"
 msgstr "Tragam za promijenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9727,25 +9836,25 @@ msgstr ""
 "Ne mogu dobiti poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ova poruka je trenutno nedostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao pronaći tekst poruke u FETCH odgovoru."
 
@@ -9800,27 +9909,37 @@ msgstr "Prostor naziva"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primjeni filtere na nove poruke u INBOXu ovog servera"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Provjeri za nove poruke u svim mapama"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Provjeri za nove poruke u svim mapama"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP poslužitelj %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9829,65 +9948,65 @@ msgstr "IMAP servis za %s na %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9898,24 +10017,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Ne mogu stvoriti mapu: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorij ne smije sadržati direktorije "
 
@@ -9941,7 +10068,7 @@ msgstr ""
 "\n"
 " !!! NEMOJTE OVO KORISTITI ZA OZBILNU UPORABU !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ne mogu se spojiti na POP poslužitelj na %s "
@@ -10025,8 +10152,8 @@ msgstr ""
 "Mutt stilu."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10038,55 +10165,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne mogu dobiti mapu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Ne mogu obrisati meta datoteku mape: `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisam mogao sačuvati sažetak: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne mogu dodati poruku u sažetak: nepoznat razlog"
 
@@ -10104,53 +10231,44 @@ msgstr "Ne mogu dodati poruku u maildir mapu: %s: %s"
 msgid "Invalid message contents"
 msgstr "Neispravan sadržaj poruke"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nisam mogao otvoriti direktorij `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Ne mogu dobiti mapu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mapa `%s' ne postoji."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nisam mogao napraviti mapu `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Ne mogu stvoriti mapu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' nije maildir direktorij."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao obrisati direktorij `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "nije maildir direktorij"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10172,9 +10290,9 @@ msgid "Checking for new messages"
 msgstr "Provjeravam za nove poruke"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Smiještam direktorij"
@@ -10218,156 +10336,134 @@ msgstr "Mapa izgleda nepopravljivo oštećena."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Sastavljanje poruke neuspjelo: Oštećeno sandučić?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nisam mogao otvoriti datoteku `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Ne mogu stvoriti mapu s ovim imenom."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Ne mogu stvoriti direktorij `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Ne mogu priložiti datoteku %s: nije standardna datoteka"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nisam mogao napraviti datoteku `%s':\n"
+"isam mogao obrisati mapu `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nije regularna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"isam mogao obrisati mapu `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' nije prazna. Nije obrisana."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Ne mogu stvoriti mapu s ovim imenom."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu stvoriti mapu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Mapa već postoji"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Ime nove mape je neispravno."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ne mogu preimenovati direktorij %s u %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisam mogao otvoriti direktorij: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatalna greška u obradi pošte na poziciji %ld u direktoriju %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu provjeriti mapu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisam mogao otvoriti datoteku: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne mogu otvoriti privremeni sandučić: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisam mogao zatvoriti izvornu mapu%s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisam mogao zatvoriti temp mapu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao preimenovati direktorij: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Neslaganje sažetka i direktorija, čak i nakon sinhronizacije"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greška: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisam mogao spremiti direktorij: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Greška kod pisanja u privremeni pretinac: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje u tmp poštanskog pretinca neuspjelo: %s: %s"
@@ -10381,10 +10477,17 @@ msgstr "MH dodaja poruke otkazana"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nisam mogao napraviti mapu `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' nije direktorij."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Ne mogu dobiti mapu: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10406,6 +10509,29 @@ msgstr "Spool `%s' nije regularna datoteka ili direktorij"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne postoji."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nisam mogao otvoriti direktorij `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mapa `%s' ne postoji."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nisam mogao napraviti mapu `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10643,46 +10769,46 @@ msgstr ""
 "Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu "
 "umjesto toga."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Nepoznata greška: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nema takve mape: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Ne mogu dobiti grupu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komanda nije uspjela: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Tražim nove poruke"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nepoznat odgovor poslužitelja: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Koristite poništi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
@@ -10729,7 +10855,7 @@ msgstr "Obriši nakon %s dana"
 msgid "Disable support for all POP3 extensions"
 msgstr "Onemogući podršku za sva POP3 proširenja"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10818,7 +10944,7 @@ msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10871,7 +10997,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11038,7 +11164,7 @@ msgstr "SMTP dostava pošte preko %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu poslati poruku: adresa pošiljatelja nije ispravna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Slanje poruke"
 
@@ -11145,34 +11271,34 @@ msgstr "QUIT zahtjevu je isteklo vrijeme: %s"
 msgid "QUIT response error"
 msgstr "QUIT pogrešan odgovor"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Dodaj datoteku poruci"
 
@@ -11288,14 +11414,14 @@ 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:656
+#: composer/e-msg-composer.c:652
 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11303,7 +11429,7 @@ msgstr ""
 "Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
 "za ovaj korisnički račun"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11312,30 +11438,30 @@ msgstr ""
 "Greška kod čitanja datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Datoteka postoji, prepisai preko nje?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Greška kod spremanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Greška kod učitavanja datoteke: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Greška kod pristupa datoteci: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Ne mogu da povratim poruku iz urednika"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11344,7 +11470,7 @@ msgstr ""
 "Ne mogu da tražim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11353,7 +11479,7 @@ msgstr ""
 "Ne mogu da skratim datoteku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11362,7 +11488,7 @@ msgstr ""
 "Ne mogu kopirati opis datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11371,7 +11497,7 @@ msgstr ""
 "Greška kod automatskog spremanja poruke: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11379,7 +11505,7 @@ msgstr ""
 "Ximian Evolution je našao nespremljene datoteke iz prethodnih sesija.\n"
 "Želite li ih pokušati povratiti?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11390,42 +11516,42 @@ msgstr ""
 "\n"
 "Želite li da sačuvam promjene?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Potpis:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automatski stvoren"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "------"
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Prikaži Traku s privicima (ovdje ubaciti privitke)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Sastavi poruku"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11433,7 +11559,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu pokrenuti kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11445,7 +11571,7 @@ msgstr ""
 "Molim vas da provjerite imate li odgovarajuće inačice\n"
 "gtkhtml i libgtkhtml na sistemu.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11453,7 +11579,7 @@ msgstr ""
 "Ne mogu kreirati prozor za sastavljanje:\n"
 "Ne mogu aktivirati komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11803,7 +11929,7 @@ msgstr "Onda"
 msgid "You must specify a folder."
 msgstr "Morate odrediti mapu."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Označi mapu"
@@ -11818,19 +11944,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Za napraviti"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Kasnije"
 
@@ -11918,7 +12044,7 @@ msgstr ""
 "Datum poruke će biti uspoređen sa\n"
 "trenutnim vremenom kada se filtriranje dogodilo."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtualni direktoriji"
 
@@ -11934,7 +12060,7 @@ msgstr "prije"
 msgid "months"
 msgstr "mjeseci"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekunde"
 
@@ -12104,7 +12230,7 @@ msgstr "nije označen"
 msgid "Junk Test"
 msgstr "Lipanj"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Oznaka"
@@ -12210,9 +12336,10 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subjekt"
 
@@ -12220,25 +12347,25 @@ msgstr "Subjekt"
 msgid "Unset Status"
 msgstr "Nedodeljen status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ime pravila '%s' nije jedinstveno, odaberite drugo."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Promjeni pravilo"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Ime pravila"
 
@@ -12278,15 +12405,15 @@ msgstr "Subjekt sadrži"
 msgid "Subject does not contain"
 msgstr "Subjekt ne sadrži"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Morate imenovati ovaj vfolder."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Morate da odredite najmanje jednu mapu kao izvor."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "VFolder izvor"
 
@@ -12335,9 +12462,9 @@ msgstr "Preglednik za direktorije Evolucija pošte"
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Pošta"
 
@@ -12345,7 +12472,7 @@ msgstr "Pošta"
 msgid "Mail Accounts"
 msgstr "Poštanski račun"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Osobine pošte"
 
@@ -12383,15 +12510,15 @@ msgstr "Morate dati ispravno ime skripte."
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Dodaj potpis skripte"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
@@ -12475,7 +12602,6 @@ msgid "Unread messages"
 msgstr "Nepročitane poruke"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovdje za odabir mape>"
 
@@ -12483,302 +12609,320 @@ msgstr "<kliknite ovdje za odabir mape>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorij"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Na ovom računalu"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolder-i"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "Neupariv"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Dolazna pošta"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ne mogu obrisati mapu: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Treba li doista obrisati mapu \"%s\" i sve njene podmape?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Obriši \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapu „%s“ u:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Mapa pod imenom \"%s\" već postoji. Molim koristite neko drugo ime."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Pomakni"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Postavke..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Ispis"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Odgovori svima"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Ukloni oznaku"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označi kao pročitano"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Označi kao nepročitano"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Označ_i kao važno"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nebitno "
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Označi kao smeće"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Označi da nije smeće"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Poništi brisanje"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "_Premjesti u mapu..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Pri_mjeni filtere"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu "
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "VFolder na niti"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filter na Sub_jekt"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filter na P_ošiljatelja"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filter na Pri_matelje"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filter na _Dopisni popis"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtar na niti"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Uobičajeno"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Ispiši poruku"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za slanje pošte %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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 autentičan."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Ispravni potpis"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 "Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj koji "
 "tvrdi da jest."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Neispravni potpis"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 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:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12786,11 +12930,11 @@ msgstr ""
 "Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može "
 "provjeriti"
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Nekriptirano"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12798,11 +12942,11 @@ msgstr ""
 "Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje "
 "internetom."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Kriptirano, slaba enkripcija"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12812,22 +12956,22 @@ msgstr ""
 "teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno "
 "kratkom vremenu."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Šifrirano"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Kriptirano, jaka enkripcija"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12836,35 +12980,35 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 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:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Pogledaj unutar"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
@@ -12907,29 +13051,34 @@ msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
 msgid "Formatting message"
 msgstr "Formatiranje poruke"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc (nevidljiva kopija)"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Program e-pošte"
 
@@ -12943,8 +13092,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -12961,19 +13110,24 @@ msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Nepodržani format potpisa"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nepoznata greška pri provjeri potpisa"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri provjeri potpisa"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ugrađeni)"
 
@@ -12989,56 +13143,56 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nije uspjela migracija pop3 uid međuspremnika: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Neuspjelo stvaranje veze ka '%s': %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nisam uspio otvoriti spremište za `%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Snimi kao..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nenaslovljena_slika.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Pošalji poruku na..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
@@ -13085,17 +13239,17 @@ msgstr "Filteri"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Proslijeđena poruka --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13104,7 +13258,7 @@ msgstr ""
 "Ne mogu spremiti u `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13113,29 +13267,35 @@ msgstr ""
 "`%s' već postoji.\n"
 "Prepisati?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "cedulja"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Greška: '%s' postoji i nije obična datoteka"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Spremi poruku..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Dodaj adresu"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Pošta od %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisam mogao napraviti privremeni direktorij: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13148,7 +13308,7 @@ msgstr ""
 "\n"
 "Dali stvarno želite obrisati ove poruke?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13173,81 +13333,95 @@ 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 "Check incoming mail being junk for IMAP accounts"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Boja isticanja citata"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Boja isticanja citata."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Uobičajeni znakovni skup u kojem se pišu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Uobičajeni znakovni skup u kojem se pišu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Uobičajeni znakovni skup u kojem se prikazuju poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Uobičajeni znakovni skup u kojem se prikazuju poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Uobičajeni način proslijeđivanja"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Predefinirani naslov poruke."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Predefinirani naslov poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Uobičajeni način odgovaranja"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Uobičajena širina za ploču trake mapa"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Uobičajena širina za ploču trake mapa"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtavanje grešaka u pravopisu prilikom utipkavanja"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ispražnjavanje mapa sa smećem prilikom izlaska iz Evolutiona."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Omogući caret način rada, tako da se vidi pokazivač prilikom čitanja pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Omogući/onemogući caret način rada"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Visina ploče s popisom poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Visina ploče s popisom poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13257,15 +13431,15 @@ msgstr ""
 "mime-tipovi koji su prikazani u popisu a odgovaraju bonobo-component "
 "pregledniku u GNOME mime-tip bazi mogu se koristiti za pregled sadržaja."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Izlistavanje oznaka i njima pridruženih boja"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Popis korisničkih računa"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13274,11 +13448,11 @@ msgstr ""
 "sadrži znakovne nizove s imenima poddirektorija relativnih s /apps/evolution/"
 "mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:29
 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:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13287,15 +13461,15 @@ msgstr ""
 "sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML heks "
 "kodiranje."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 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:29
+#: mail/evolution-mail.schemas.in.in.h:32
 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:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13305,80 +13479,80 @@ 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Logiranje akcija filtra u navedenu log datoteku."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Logiranje akcija filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao pregledano nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao pregledano nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označivanje citata u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označivanje citata u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (normalno, puna zaglavlja, kod)"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obavijest o novopristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Nova vrsta obavijesti o pristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Iskoči u slučaju praznog naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 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:46
+#: mail/evolution-mail.schemas.in.in.h:49
 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:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Upitaj korisnika prilikom brisanja"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik popuni samo Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13386,97 +13560,91 @@ 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 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:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zamijeni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 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:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Pokreni testiranje na smeće na dolaznoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Pošalji poštu formatiranu kao HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Prikaži animirane slike kao animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikaži obrisane poruke (precrtane) u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u listi poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Prikaži karticu \"Pregled\""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Zvučna datoteka koju treba odsvirati pri pristizanju nove pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Određuje tip notifikacije o novoj pošti koju korisnik želi koristiti."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Provjera pravopisa na licu mjesta"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Pismo terminala"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Pismo terminala za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Pismo varijabilne širine za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13484,99 +13652,99 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Prikaži listu poruka u obliku niti."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaži listu poruka u obliku niti na temelju naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Vremensko ograničenje poruke obilježene kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "UID string predefinirang korisničkog računa"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Koristi Spamassassin daemon i klijent"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Koristi Spamassassin daemon i klijent (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Koristi prilagođena pisma"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi prilagođena pisma za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne testove za spam."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne testove za spam (bez DNS-a)."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Font promjenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Pogled/Bcc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Pogled/Bcc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Pogled/Cc stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Pogled/Cc stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Pogled/Od stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Pogled/Od stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Pogled/Za stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Pogled/Za stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Pogled/OdgovoriNa stavka izbornika je uključena."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13584,70 +13752,67 @@ msgstr ""
 "Treba li se prebaciti na nizanje po subjektu kada poruka ne sadrži In-Reply-"
 "To ili References zaglavlja."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Uvoz"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm uvoznik"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolucija Pine uvoznik"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution uvozi vašu staru Elm poštu"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Obrađujem"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim pričekajte"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Uvozim %s kao %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Pretražujem %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Uvoz datoteka"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13655,16 +13820,44 @@ msgstr ""
 "Evolucija je pronašla Elm datoteke pošte\n"
 "Želite li  ih uvesti u Evoluciju?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "M_apa sa skicama:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Izaberi certifikat za uvoz"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Uvoz"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Uvoz datoteka"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Pretražujem %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13690,7 +13883,7 @@ msgstr ""
 "prioriteta. Provjerite uvežene filtere da se uvjerite\n"
 "radi li sve kao što bi trebalo."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13702,7 +13895,7 @@ msgstr ""
 "opciju, koju Evolution ne podržava.\n"
 "Ovi filteri neće ostati."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13716,31 +13909,24 @@ msgstr ""
 "su promjenjeni da bi mogli provjeriti je li taj niz\n"
 "sadržan u tijelu poruke ili nije."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution uvozi vaše stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Pretražujem filtere za poštu"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Pretražujem mapu"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Počinjem uvoz"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution uvozi vaše stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Postavke"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Filteri pošte"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13748,11 +13934,20 @@ msgstr ""
 "Evolution je pronašao Netscape datoteke pošte.\n"
 "Želite li ih uvesti u Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution uvozi vaše stare Pine podatke"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Uvoz datoteka"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adresar"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13760,7 +13955,7 @@ msgstr ""
 "Evolution je pronašao Pine datoteke pošte.\n"
 "Želite li ih uvesti u Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Vino"
 
@@ -13803,19 +13998,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Niste unijeli sve potrebne podatke."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolution računa"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Računalo:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Korisničko ime:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Putanja:"
 
@@ -13867,27 +14062,42 @@ msgstr ""
 "    '%s'\n"
 "I osvježen sadržaj."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "New VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filteri pošte"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Kreiraj novi kalendar"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI poruke koju će pogled pokazati"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
 
@@ -13929,7 +14139,7 @@ msgstr ""
 "Molim unesite podatke o načinu na koji želite slati poštu. Ako niste "
 "sigurni, pitajte sustav administratora ili davatelja Internet usluga."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Upravljanje računima"
 
@@ -13956,118 +14166,114 @@ msgid "Connecting to server..."
 msgstr "Spajam se na server...\r"
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "Pr_ovjeravam podržane tipove "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL nije podržan u ovoj inačici Evolutiona) "
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL nije podržan u ovoj inačici Evolutiona) "
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>Prikazana zaglavlja e-pošte</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "A_lso kriptiranje sebi prilikom slanja kriptirane pošte"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Urednik računa"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informacije o računu"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Dodaj sk_riptu"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Dodaj novi potpis..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Uvij_ek šifriraj na mene kod slanja šifrirane pošte"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Uvijek pošalji _skrivenu kopiju (Bcc) na:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Uvijek pošalji _kopiju (Cc) na:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvijek _vjeruj ključevima u mojoj vezi kada šifriraš"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Pridruži izvornu poruku"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Privitak"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Provjera vjerodostojnosti"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Kodna stranica:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Boje"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Provjera _dolazne pošte"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Provjeri pravopis dok kucam"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Provjera za novu poštu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Boja pogrešno napisanih riječi:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Podesiti izvor?"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14083,278 +14289,274 @@ msgstr ""
 "\n"
 "Pritisnite \"Primjeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Uobičajeno"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Predefinirano ponašanje"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Predefenirana kodna _strana"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Brisanje pošte"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Digitalno _potpisivanje izlaznih poruka (uobičajeno)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahtjeve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "M_apa sa skicama:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Korisnički računi za e-mail"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_Poštanska adresa"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Isprazni mape sa smećem pri izlazu"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "_Potvrda kriptiranja:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolution računa"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Izvrši zapovijed..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fik_sirana -širina:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Mogućnosti filtra"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatiranje poruka u H_TML-u"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Zaglavlja"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etikete i boje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Učitavanje slika"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Lokacija sandučića"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Prikaz poruka"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Pisma poruke"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "&Obavijest o novim porukama"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: biti ćete upitani za lozinku dok se ne spojite prvi put"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Opcionalne informacije"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG osobna karta _ključa:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Odabir boje"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Ispisana pisma "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "kao citate"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Odgovor na:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Opcije za primanje"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Potrebni podaci"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Vrati zadano"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Sigurnost"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sigurni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Odaberite pismo utvrđene širine za HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberite pismo utvrđene širine za HTML radi ispisa"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Odaberite pismo promjenjljive širine za HTML"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberite pismo promjenjljive širine za HTML radi ispisa"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Direktorij poslanih _poruka"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Pripremljene i poslane poruke"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Pos_lužitelj zahtijeva autentifikaciju"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Postavke poslužitelja"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tip poslužitelja:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Potpisivanje certifikata:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Provjera pravopisa"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standardni Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14364,7 +14566,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišteno\n"
 "samo za svrhu prikazivanja na zaslonu."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14373,7 +14575,7 @@ msgstr ""
 "Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo "
 "jezici za koje imate instaliran rječnik."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14381,15 +14583,15 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj korisnički račun.\n"
 "Na primjer: \"Poslovni\" ili \"Osobni\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Koristi _daemon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14399,171 +14601,171 @@ msgstr ""
 "\n"
 "Pritisnite \"Naprijed\" za početak. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Dod_aj potpis"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Uvijek učitaj slike sa mreže"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Uvijek potpiši odlazeće poruke na ovom korisničkom računu"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Tip identifikacije: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Tip identifikacije: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automatski provjeri za novu poštu svakih"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatski ubaci slike sa osmjesima"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Oglasi se kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Potvrdi kada izbacuješ mapu"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Predefinirani potpis:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Uobičajene postavke"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj me obavještavati kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "Omogući"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Kriptiranje izlaznih poruka (uobičajeno)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Stil _prosljeđivanja "
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Puno ime:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML pošta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Smeće"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Učitavanje slika ako je pošiljatelj u adresaru"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "_Samo lokalni testovi"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Neka je ovo moj glavni korisnički račun "
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane poslije "
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nikada ne učitavaj slike sa mreže"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Primanje pošte"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Povrati predefinirano"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Odaberi..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Slanje pošte"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Potpisi"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standardno pismo:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Pismo za terminal:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Koristi sigurnosnu vezu (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
@@ -14586,7 +14788,7 @@ msgstr ""
 "Greška kod izvršenja operacije:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Radim"
 
@@ -14598,12 +14800,12 @@ msgstr "Filtriram direktorij"
 msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14612,116 +14814,116 @@ msgstr ""
 "Nisam mogao dodati u %s: %s\n"
 "Umjesto toga dodajem u lokalnu mapu „Poslano“."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Šaljem \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Poruka %d od %d nije poslana"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Učitavam poruke (%d)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Spremam %d poruku(e)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14730,7 +14932,7 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14739,11 +14941,11 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14752,22 +14954,22 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Mijenjam status smeća"
 
@@ -14799,38 +15001,38 @@ msgstr "Ši&firiraj"
 msgid "Security Information"
 msgstr "Podaci o sigurnosti"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Poništavam...\r"
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Poslužitelj: %s, tip: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, tip: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Pošalji i primi poštu"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Poništi sve"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Ažuriram..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
@@ -14937,20 +15139,20 @@ msgstr ""
 "    '%s'\n"
 "Potom su osvježeni."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokušavam promijeniti vmapu '%s' koja ne postoji."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "New VFolder"
 
@@ -15270,97 +15472,20 @@ msgstr "Neumrežene mape"
 msgid "Autocompletion Folders"
 msgstr "Mape za samodopunjavanje"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Ne mogu kopirati mapu: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Ne mogu premjestiti mapu: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Ne mogu premjestiti mapu preko nje same."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Ne mogu kopirati mapu preko iste."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Ne mogu premjestiti mapu u neku od njenih potomaka."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Navedite mapu u koji će se mapa „%s“ kopirati:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopiraj mapu"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Navedite mapu u koju će se mapa „%s“ premjesti:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Premjesti mapu"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Ne mogu obrisati mapu:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Zaista da brišem mapu „%s“?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Ne mogu preimenovati mapu:\n"
+"Ne mogu napraviti navedenu mapu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Navedeno ime direktorija nije ispravno: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Odabrani mapa ne pripada drugom korisniku"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Ne mogu ukloniti mapu:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Ne mogu napraviti navedenu mapu:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez naziva) "
@@ -15500,7 +15625,7 @@ msgstr "Nisam mogao izvršiti gpg."
 msgid "_Import"
 msgstr "_Uvoz"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Prekidam veze..."
 
@@ -15538,6 +15663,10 @@ msgstr "Ne mogu otvoriti djeljeni direktorij: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Ne mogu naći navedenu dijeljenu mapu."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Počinjem uvoz"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15654,123 +15783,6 @@ msgstr "Baza sa postavkama nije pronađena"
 msgid "Generic error"
 msgstr "Generička greška"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Napravi novu grupu prečaca"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Ime grupe:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Da li zaista želite da uklonite grupu „%s“ sa trake prečaca?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Preimenuj grupu prečaca"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Preimenuj odabranu grupu prečaca u:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Male ikone"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Prikazuj kratice kao male sličice"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Velike ikone"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Prikazuj kratice kao velike sličice"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Dodaj grupu..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Napravi novu grupu prečaca"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Ukloni ovu grupu..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Ukloni ovu grupu prečaca"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Pre_imenuj ovu grupu..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Preimenuj ovu grupu prečaca"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Sakrij liniju sa prečicama"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Sakrij liniju sa prečicama"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Napravi _uobičajene prečace"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Napravi uobičajene prečace"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Preimenuj prečac"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Preimenuj odabrani prečac u:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Otvori direktorij na koji pokazuje ova prečica"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "_Otvori u novom prozoru"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Otvori direktorij vezan ovom prečicom u novom prozoru"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Preimenuj ovaj prečac"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Ukloni"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Ukloni prečac sa linije prečaca"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Greška kod spremanja kratica."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Kratice"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kvadratić"
@@ -15781,11 +15793,6 @@ msgstr "Kvadratić"
 msgid "New"
 msgstr "Novi"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "„%s“ u „%s“"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16082,45 +16089,45 @@ msgstr ""
 "%s: --online i --offline se ne mogu koristiti zajedno.\n"
 "  Za više informacija, upišite %s.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Izaberi certifikat za uvoz"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Purpose"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Istječe"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Preglednik certifikata: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Unesite lozinku za %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16129,7 +16136,7 @@ msgstr ""
 "Izdano od\n"
 "  Naslov: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16194,7 +16201,7 @@ msgstr ""
 "Prije pružanja povjerenja CA-u u bilo koju svrhu, trebate pregledati njegov "
 "certifikat, politiku postupanja i procedure (ako je dostupno)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Potvrda"
 
@@ -16259,11 +16266,11 @@ msgstr "Organizational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL certifikat klijenta"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL certifikat poslužitelja"
 
@@ -16309,209 +16316,209 @@ msgstr "You have certificates on file that identify these people:"
 msgid "Your Certificates"
 msgstr "Vaše potvrde"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Certifikat već postoji"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Inačica"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Inačica 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Inačica 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Inačica 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 s RSA enkripcijom"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 s RSA enkripcijom"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 s RSA enkripcijom"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA enkripcija"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključeva certifikata"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Vrsta Netscape uvjerenja"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikator ključeva izdavača certifikata"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator objekta (%S)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Identifikator algoritma"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Podaci o subject algoritmu javnog  ključa"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Algoritam javnog ključa"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Subjektov javni ključ"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Greška: obrađivanje ekstenzije nije moguće"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Potpisnik objekta"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "Izdavač SSL certifikata"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Ovlasti certifikata elektronske pošte"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Potpisujem"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "Prihvaćanje"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Ključ šifriranja"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Šifriranje podataka"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Ključni dogovor"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Potpisnik uvjerenja"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "CRL Potpisnik"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Kritično"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Nije kritično"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Nastavci"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa certifikata"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Izdavatelj"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni ID Izdavatelja"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "Jedinstveni ID subjekta"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Vrijednost potpisa uvjerenja"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 datoteka s lozinkama"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Uvezeni certifikat"
 
@@ -17098,7 +17105,8 @@ msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17106,7 +17114,8 @@ msgid "A_pply Filters"
 msgstr "_Primijeni filtere"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Dodaj pošiljaoca u adresar"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17551,10 +17560,6 @@ msgstr "_Oblikovanje"
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Otvori"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Otvori datoteku"
@@ -17916,22 +17921,6 @@ msgstr "_Pošalji / Primi"
 msgid "_Window"
 msgstr "_Prozor"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Pregled ispisa"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Ispis sažetka "
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Ponovno učitavanje"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Osvježi pregled"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Prema _poduzeću"
@@ -17992,8 +17981,8 @@ msgstr "Uz _kategoriju"
 msgid "_Tasks"
 msgstr "_Zadaci"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18236,23 +18225,23 @@ msgstr "_&Traži"
 msgid "_Find Now"
 msgstr "_Traži sad"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Identifikacijski broj stavke"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID  podstavke"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "_Traži sad"
 
@@ -18266,6 +18255,207 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Izvori adresara"
+
+#~ msgid "No data provided"
+#~ msgstr "Nisam dobio podatke"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisam mogao otvoriti datoteku `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu stvoriti direktorij `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisam mogao napraviti datoteku `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' nije direktorij."
+
+#~ msgid "On this Computer"
+#~ msgstr "Na ovom računalu"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Uvozim %s kao %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Pretražujem filtere za poštu"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Pretražujem mapu"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Ne mogu kopirati mapu: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Ne mogu premjestiti mapu: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Ne mogu premjestiti mapu preko nje same."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Ne mogu kopirati mapu preko iste."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Ne mogu premjestiti mapu u neku od njenih potomaka."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Navedite mapu u koji će se mapa „%s“ kopirati:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopiraj mapu"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Navedite mapu u koju će se mapa „%s“ premjesti:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Premjesti mapu"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu obrisati mapu:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Zaista da brišem mapu „%s“?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu preimenovati mapu:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Odabrani mapa ne pripada drugom korisniku"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu ukloniti mapu:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Napravi novu grupu prečaca"
+
+#~ msgid "Group name:"
+#~ msgstr "Ime grupe:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Da li zaista želite da uklonite grupu „%s“ sa trake prečaca?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Preimenuj grupu prečaca"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Preimenuj odabranu grupu prečaca u:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Male ikone"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Prikazuj kratice kao male sličice"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Velike ikone"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Prikazuj kratice kao velike sličice"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Dodaj grupu..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Napravi novu grupu prečaca"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Ukloni ovu grupu..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Ukloni ovu grupu prečaca"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Pre_imenuj ovu grupu..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Preimenuj ovu grupu prečaca"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Sakrij liniju sa prečicama"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Sakrij liniju sa prečicama"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Napravi _uobičajene prečace"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Napravi uobičajene prečace"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Preimenuj prečac"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Preimenuj odabrani prečac u:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Otvori direktorij na koji pokazuje ova prečica"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "_Otvori u novom prozoru"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Otvori direktorij vezan ovom prečicom u novom prozoru"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Preimenuj ovaj prečac"
+
+#~ msgid "Re_move"
+#~ msgstr "_Ukloni"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Ukloni prečac sa linije prečaca"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Greška kod spremanja kratica."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Kratice"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "„%s“ u „%s“"
+
+#~ msgid "Print Summary"
+#~ msgstr "Pregled ispisa"
+
+#~ msgid "Print summary"
+#~ msgstr "Ispis sažetka "
+
+#~ msgid "Reload"
+#~ msgstr "Ponovno učitavanje"
+
+#~ msgid "Reload the view"
+#~ msgstr "Osvježi pregled"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopiraj u mapu..."
 
diff --git a/po/hu.po b/po/hu.po
index 4b7e7f6199..805fe1f2c9 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -51,8 +51,7 @@ msgstr "Postafiókok beállítása"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Névjegyek"
 
@@ -93,20 +92,20 @@ msgstr "Evolution mappabeállító kontroll"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -114,65 +113,65 @@ msgstr "Címjegyzék"
 msgid "Delete"
 msgstr "Törlés"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Tulajdonságok..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Névjegy"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Új névjegy készítése"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Új címlista"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Címlista"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Új címlista készítése"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 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:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra."
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 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:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Hiba a sémainformációk betöltése közben"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Várakozás..."
@@ -186,42 +185,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s pingelése"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Személyes"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP-kiszolgáló"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP-kiszolgáló"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Névkiegészítési mappák"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -234,7 +235,7 @@ msgstr ""
 "a keresési feltételeket, vagy emeld meg az eredmények maximális \n"
 "számát a címtárkiszolgáló beállításainál ehhez a címjegyzékhez."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -246,20 +247,20 @@ msgstr ""
 "feltételeket, vagy emeld meg az ehhez a címjegyzékhez tartozó\n"
 "időkorlátot a címtárkiszolgálón."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Ez a keresés nem volt sikeres."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -268,7 +269,7 @@ msgstr ""
 "Nem sikerült megnyitni a címjegyzéket. Ellenőrizd, hogy az útvonal\n"
 "létezik-e, és van-e jogod az eléréséhez."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -278,7 +279,7 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "az LDAP-kiszolgáló nem működik."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -290,7 +291,7 @@ msgstr ""
 "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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -300,27 +301,32 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "a kiszolgáló nem működik."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Nem sikerült megnyitni a címjegyzéket"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sÍrd be %s jelszavát (%s felhasználó)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "Az URI, amit a naptár megjelenít"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -364,7 +370,7 @@ msgstr "  _Támogatott típusok lekérdezése"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -397,20 +403,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "LDAP-beállítás varázsló"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Címjegyzék forrásai"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Címjegyzék forrásai"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Címjegyzék forrásai..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Mindig"
 
@@ -421,7 +428,8 @@ msgstr "Névtelenül"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -430,54 +438,54 @@ msgstr ""
 "\n"
 "Kattints a \"Befejezés\" gombra a beállítások mentéséhez."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Megkülönböztető _név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Befejezve"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Általános"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Csoport"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Soha"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -493,23 +501,23 @@ msgstr ""
 "használja. Keresd meg a rendszergazdát, amennyiben a kiszolgáló ezen "
 "protokollok valamelyikét használja!"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Egy"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Keresés _hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Keresés"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Kiválasztva:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -519,7 +527,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -537,7 +545,7 @@ msgstr ""
 "kapcsolat\n"
 "már eleve biztonságos."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -551,7 +559,7 @@ msgstr ""
 "sebezhetővé \n"
 "válik a külső támadásokkal szemben."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -563,44 +571,45 @@ msgstr ""
 "használja az LDAP-keresésekhez, valamint névjegyek létrehozásához és "
 "szerkesztéséhez."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "A kijelzett név meghatározása az utolsó szükséges lépés az LDAP-kiszolgáló "
 "beállítása során."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "1. lépés: Kiszolgáló adatai"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "2. lépés: Kapcsolódás a kiszolgálóhoz"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "3. lépés: Keresés a címtárban"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Al"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -613,7 +622,7 @@ msgstr ""
 "és mennyi ideig tartson. Ha meg szeretnéd változtatni az értékeket, kérd a "
 "rendszergazda segítségét."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -624,7 +633,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -640,12 +649,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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -657,23 +667,24 @@ msgstr ""
 "a kiszolgálóval kapcsolatban. Amennyiben ezek az információk nem állnak\n"
 "rendelkezésedre, keresd meg a rendszergazdát."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Itt határozhatod meg az egyszerre letölthető bejegyzések maximális számát. "
 "Ha túl\n"
 "magasra állítod ezt az értéket, jelentős mértékben lelassul a címjegyzéked."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -684,7 +695,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -693,7 +704,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -703,7 +714,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:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -714,28 +725,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TLS használata:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Megkülönböztető névvel (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "E-mail cím használatával"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Amikor csak lehetséges"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -748,19 +759,19 @@ msgstr ""
 "Amennyiben nem vagy biztos benne, hogy ismered ezeket az adatokat, kérdezd "
 "meg a rendszergazdát."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Megjelenítendő név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -769,39 +780,39 @@ msgstr "_Letöltési korlát:"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Bejelentkezési mód:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Portszám:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Kiszolgáló neve:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Szundi idő (percek)"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kártya"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -924,7 +935,7 @@ msgstr "Együttműködés"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Névjegyszerkesztő"
 
@@ -1021,10 +1032,10 @@ msgstr "Ka_tegóriák..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1072,15 +1083,15 @@ msgid "_Web page address:"
 msgstr "_Weblap címe:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Cím"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2071,108 +2082,116 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Levél"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Szolgáltatás rendelkezésre áll"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Hely:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: 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-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Otthoni"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Munka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Egyéb"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Forrás"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Írható mező"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Megváltoztatva"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Postafiók neve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "A kategóriaszerkesztő nem elérhető."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 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:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Névjegy mentése VCard-ként"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2180,7 +2199,7 @@ msgstr ""
 "Biztos vagy benne, hogy eltávolítod\n"
 "ezeket a névjegyeket?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2188,47 +2207,52 @@ msgstr ""
 "Biztos vagy benne, hogy\n"
 "eltávolítod ezt a névjegyet?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Üzleti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Csoport"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Gyors névjegy hozzáadás"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Részletes szerkesztés"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Teljes név:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
@@ -2387,11 +2411,11 @@ msgid "Is New List"
 msgstr "Új lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Címlista-szerkesztő"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Lista mentése VCard-ként"
 
@@ -2482,13 +2506,13 @@ msgid "Email begins with"
 msgstr "E-mail ezzel kezdődik"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategória"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bármely mező tartalmazza"
 
@@ -2505,101 +2529,101 @@ msgid "Type"
 msgstr "Típus"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Mentés VCard-ként"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Új névjegy..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Új címlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Mappára ugrás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importálás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Névjegyek keresése..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Címjegyzék forrásai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot beállításai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Névjegy továbbítása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Levél küldése ennek a személynek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Boríték nyomtatása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Címjegyzék..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Címjegyzék..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kivágás"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Másolás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktuális nézet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2612,8 +2636,8 @@ msgstr ""
 "felületet"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bármelyik kategória"
 
@@ -2656,7 +2680,7 @@ msgid "Company Phone"
 msgstr "Céges telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mail"
 
@@ -2718,7 +2742,7 @@ msgid "Nickname"
 msgstr "Becenév"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Megjegyzés"
 
@@ -2727,7 +2751,7 @@ msgid "Office"
 msgstr "Hivatal"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Szervezet"
 
@@ -2855,69 +2879,75 @@ msgstr "Kiválasztva"
 msgid "Has Cursor"
 msgstr "Megmutatva"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Tagok"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Munka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Csoport"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Személyes"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Beosztás"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Otthoni fax"
@@ -2927,8 +2957,8 @@ msgid "Success"
 msgstr "Sikerült"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2960,7 +2990,7 @@ msgstr "A protokoll nem támogatott"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2980,7 +3010,8 @@ msgid "TLS not Available"
 msgstr "TLS nem elérhető"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "A címjegyzék nem létezik"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3123,7 +3154,8 @@ 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:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "A címjegyzék lekérdezése..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3181,18 +3213,38 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution LDIF-importáló"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP adatcserélő formátum (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution VCard-importáló"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolution VCard-importáló"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Kijelölt névjegyek nyomtatása"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Kijelölt névjegyek nyomtatása"
@@ -3285,7 +3337,7 @@ msgstr "Margók"
 msgid "Number of columns:"
 msgstr "Oszlopok száma:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Beállítások"
 
@@ -3468,8 +3520,8 @@ msgstr "Nincs fájlnév megadva."
 msgid "Unnamed List"
 msgstr "Névtelen lista"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Írd be a jelszót"
@@ -3550,10 +3602,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution Teszt komponens"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Feladatok"
 
@@ -3597,26 +3648,24 @@ msgstr "Szundi idő (percek)"
 msgid "_Edit appointment"
 msgstr "_Találkozó szerkesztése"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Megnyitás"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Megnyitás"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Nincs leírás."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3625,12 +3674,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3642,7 +3691,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3659,19 +3708,19 @@ msgstr ""
 "\n"
 "Biztosan futtatni szeretnéd ezt a programot?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializálása sikertelen"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "A gnome-vfs inicializálása nem sikerült"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nem sikerült létrehozni az riasztó szolgáltatás factoryját"
 
@@ -3816,24 +3865,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Összefoglaló tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Leírás tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Megjegyzés tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Leírás tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Ki nem válogatott"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Naptár"
 
@@ -3866,7 +3921,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%b %d, %a"
 
@@ -3888,75 +3943,75 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Új találkozó"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Találkozó"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Új találkozó létrehozása"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "É_rtekezlet"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Új értekezlet összehívási kérés létrehozása"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Új egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Új egész napos esemény létrehozása"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Naptár:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Új mappa létrehozása"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4089,7 +4144,7 @@ msgstr "óránként"
 msgid "minutes"
 msgstr "percenként"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4161,7 +4216,7 @@ msgid "hour(s)"
 msgstr "óra"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "perc"
 
@@ -4172,7 +4227,7 @@ msgstr "találkozó kezdete"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Engedélyezve"
 
@@ -4224,7 +4279,7 @@ msgstr "30 perc"
 msgid "60 minutes"
 msgstr "60 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Figyelmeztetések"
 
@@ -4249,7 +4304,7 @@ msgid "Days"
 msgstr "nappal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "E_ngedélyezés"
 
@@ -4391,7 +4446,7 @@ msgid "_Fri"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "Á_ltalános"
 
@@ -4493,7 +4548,7 @@ msgstr ""
 "Kattints a \"Befejezés\" gombra a beállítások mentéséhez."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Feladatlista"
@@ -4671,23 +4726,23 @@ msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
 msgid "Validation error: %s"
 msgstr "Érvényesítési hiba: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " - "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Befejezve"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Befejezve"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Esedékes "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Esedékes "
 
@@ -4723,8 +4778,8 @@ msgstr "Napló bejegyzés - %s"
 msgid "No summary"
 msgstr "Nincs összegzés"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Mentés másként..."
 
@@ -4755,9 +4810,20 @@ msgstr "Címzett címe"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
-msgstr ""
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Címzett címe"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Naptár"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Új feladat"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4866,7 +4932,7 @@ 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:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Találkozó"
 
@@ -4890,23 +4956,32 @@ msgstr "Ütemezés"
 msgid "Meeting"
 msgstr "Értekezlet"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "A lejárat dátuma a kezdő dátum előtt van!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Hibás a kezdés dátuma"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Érvénytelen befejezési időpont"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Hibás a kezdés időpontja:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Helytelen befejezési időpont"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Hozzáférés megtagadva a naptár megnyitásához"
@@ -4983,29 +5058,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nincs"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "A kiválasztott szervezőnek nincs már fiókja."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "A szervezőt be kell állítani."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Legalább egy résztvevő szükséges."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Feladatkiadás..."
 
@@ -5202,7 +5277,7 @@ msgstr "ezen:"
 msgid "occurrences"
 msgstr "előfordulások"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dátum és idő:"
@@ -5236,7 +5311,7 @@ msgid "_No recurrence"
 msgstr "_Nincs ismétlődés"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -5278,7 +5353,7 @@ msgstr ""
 "\n"
 "Akarod menteni a változásaidat?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Változások elvetése"
 
@@ -5302,7 +5377,7 @@ msgstr "A feladat adatai létrejöttek. Elküldöd?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "A feladat adatai megváltoztak. Küldesz egy frissített változatot?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Helytelen befejezési dátum"
 
@@ -5315,7 +5390,7 @@ msgstr "% kész"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Befejezve"
 
@@ -5328,7 +5403,7 @@ msgstr "Magas"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Folyamatban"
 
@@ -5347,7 +5422,7 @@ msgstr "Normál"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nem indult még el"
 
@@ -5388,16 +5463,16 @@ msgstr "Alap"
 msgid "Assignment"
 msgstr "Kiosztás"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "A lejárat dátuma a kezdő dátum előtt van!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nem sikerült megnyitni a címjegyzéket"
@@ -5408,7 +5483,7 @@ msgstr "Bi_zalmas"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Leírás:"
 
@@ -5602,11 +5677,10 @@ msgstr "Kezdés dátuma"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Összefoglaló"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "szín"
 
@@ -5632,7 +5706,7 @@ msgstr "É"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "K"
 
@@ -5667,10 +5741,10 @@ msgstr "Nem"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -5683,99 +5757,105 @@ msgstr "Ismétlődő"
 msgid "Assigned"
 msgstr "Hozzárendelve"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Kijelölt objektumok törlése"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Objektumok frissítése"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Új _találkozó..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Új feladat"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Nyomtatás..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ugrás a _mai napra"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Ugrás dátumra..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Szabad/foglalt információ _közzététele"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Megnyitás"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "M_entés másként..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Értekezlet _tervezése..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendarként..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Beállítások..."
 
@@ -5863,7 +5943,7 @@ msgid "Alarms"
 msgstr "Ébresztők"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Kész"
 
@@ -5921,26 +6001,26 @@ msgstr "%02i perces osztá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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "du"
@@ -6122,7 +6202,7 @@ msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Mégsem"
@@ -6582,12 +6662,12 @@ msgstr "_Prioritás:"
 msgid "Web Page:"
 msgstr "Oldal"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kattints ide új feladat hozzáadásához"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6597,7 +6677,7 @@ msgstr ""
 "%s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6605,12 +6685,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyitása %s-kor"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6619,29 +6699,39 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Képek betöltése"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Képek betöltése"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Nincsenek találkozók."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Megnyitás ezzel: %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6761,16 +6851,16 @@ msgstr "Szabad/foglalt információ (%s - %s)"
 msgid "iCalendar information"
 msgstr "iCalendar információ"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Részt kell venned az eseményen."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6778,7 +6868,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6786,12 +6876,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6980,49 +7070,49 @@ msgstr "Kijelölt hónap (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Kijelölt év (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Feladat"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Állapot: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritás: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Százalékos készenlét: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategóriák: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Névjegyek: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Nyomtatási kép"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Elem nyomtatása"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Nyomtatás beállítása"
 
@@ -7031,39 +7121,39 @@ msgstr "Nyomtatás beállítása"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Feladatlista"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7120,20 +7210,20 @@ msgstr "iCalendar-fájlok (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-fájlok (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Találkozókat és eseményeket tartalmazó nyilvános mappa"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Emlékeztető!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Naptáresemények"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7141,7 +7231,7 @@ msgstr ""
 "Az Evolution Gnome Calendar fájlokat talált.\n"
 "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -8803,7 +8893,7 @@ msgstr "Nem lehet megnyitni a levelet"
 msgid "Failed on message %d"
 msgstr "%d. levél rossz"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Mappa szinkronizálása"
 
@@ -8889,7 +8979,7 @@ msgstr "Levelek másolása"
 msgid "Filtering new message(s)"
 msgstr "%d levél letöltése"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8900,15 +8990,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "A gpg felhasználói azonosító sikertelen elemzése."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "A gpg jelmondat kérés sikertelen elemzése"
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8917,31 +9007,27 @@ msgstr ""
 "Meg kell adnod a jelmondatot \"%s\"\n"
 "titkos kulcsának érvényesítéséhez."
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Megszakítva"
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, 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:814
-msgid "No data provided"
-msgstr "Nincs adatszolgáltatás"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Sikertelen titkosítás: Nincs érvényes címzett megadva."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8952,34 +9038,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Sikertelen GPG-zés: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "A %s levél dekódolása sikertelen."
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "A gpg végrehajtása sikertelen."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 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:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -8988,29 +9074,29 @@ 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, 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:1541
+#: camel/camel-gpg-context.c:1542
 #, 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:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Szövegtörzs indexelése"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
@@ -9121,22 +9207,37 @@ msgstr "Érvénytelen szerkezet miatt sikertelen a MIME titkosítás feloldása"
 msgid "parse error"
 msgstr "értelmezési hiba"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Virtuális mappa e-mail szolgáltató"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+"A leveleket más mappákon futtatott lekérdezés eredményétől függően "
+"csoportosíthatod."
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s betöltése sikertelen: A modulbetöltés nem támogatott a rendszereden."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s betöltése sikertelen: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s betöltése sikertelen: Nincs inicializáló kód a modulban."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "'%s' protokollhoz nincs támogatás"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonymous"
@@ -9299,7 +9400,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Rossz hitelesítési válasz a kiszolgálótól"
 
@@ -9435,22 +9536,7 @@ msgstr "Sikertelen gépkikeresés: a gép nem található"
 msgid "Host lookup failed: unknown reason"
 msgstr "Sikertelen gépkikeresés: ismeretlen ok"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Virtuális mappa e-mail szolgáltató"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-"A leveleket más mappákon futtatott lekérdezés eredményétől függően "
-"csoportosíthatod."
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "'%s' protokollhoz nincs támogatás"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9521,22 +9607,26 @@ msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült megnyitni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, 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:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült létrehozni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Kuka"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9771,21 +9861,31 @@ msgstr "Nincs ilyen levél (%s) ezen a helyen: %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, 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:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9802,16 +9902,11 @@ 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"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Címjegyzék"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9831,44 +9926,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Jelszó"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
 "kiszolgálóval."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Alapértelmezett"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Sűrű köd"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "A művelet leállítva"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9877,26 +9970,26 @@ msgstr ""
 "Riasztás az %s@%s IMAP-kiszolgálótól:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "A kiszolgáló válasza túl hamar véget ért."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Az IMAP-kiszolgáló válasza nem tartalmaz %s információt"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Váratlan OK válasz az IMAP-kiszolgálótól: %s"
@@ -9911,7 +10004,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "A mappa megsemmisült, és újra létre lett hozva a kiszolgálón."
 
@@ -9920,12 +10013,12 @@ msgstr "A mappa megsemmisült, és újra létre lett hozva a kiszolgálón."
 msgid "Scanning for changed messages"
 msgstr "Megváltozott levelek keresése"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nem lehet elhozni a levelet: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9941,25 +10034,25 @@ msgstr ""
 "Nem sikerült betölteni a levelet: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ez a levél jelenleg nem elérhető"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Összefoglaló adatok letöltése az új levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nem található a levéltörzs a FETCH válaszban."
 
@@ -10017,27 +10110,37 @@ msgstr "Névtér"
 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"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Új levelek keresése az összes mappában"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Új levelek keresése az összes mappában"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP-kiszolgáló"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, 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:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10046,67 +10149,67 @@ msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Nem adtál meg jelszót."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10117,24 +10220,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+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:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ismeretlen szülőmappa: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A szülőmappa nem tartalmazhat almappákat"
 
@@ -10156,7 +10267,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nem sikerült kapcsolódni a(z) %s POP-kiszolgálóhoz."
@@ -10240,8 +10351,8 @@ msgstr ""
 "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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10253,55 +10364,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, 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:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi levél fájl"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nem sikerült '%s' mappaösszegzőfájt törölni: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nem sikerült menteni az összefoglalót: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nem sikerült hozzáadni a levelet az összefoglalóhoz: ismeretlen ok"
 
@@ -10319,53 +10430,44 @@ msgstr "Nem lehet a levelet a maildir mappához fűzni: %s: %s "
 msgid "Invalid message contents"
 msgstr "A levél tartalma érvénytelen"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nem sikerült megnyitni '%s' mappát:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' mappa nem létezik."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nem sikerült létrehozni a mappát: `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr " `%s' nem maildir könyvtár."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nem sikerült törölni a mappát: `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "nem maildir könyvtár"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10387,9 +10489,9 @@ msgid "Checking for new messages"
 msgstr "Új levelek keresése"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Mappa tárolása"
@@ -10433,159 +10535,137 @@ msgstr "A mappa javíthatatlanul sérültnek néz ki."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Levélírás sikertelen: sérült postafiók?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nem sikerült megnyitni a fájlt: `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Nem könyvtárat létrehozni ezen a néven"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nem sikerült létrehozni %s könyvtárat:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Nem sikerült csatolni a fájlt: %s: nem közönséges fájl"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nem sikerült létrehozni a fájlt: `%s'\n"
+"Nem sikerült törölni a mappát: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nem közönséges fájl."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nem sikerült törölni a mappát: `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem üres. Nem törölhető."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Nem könyvtárat létrehozni ezen a néven"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "A kártyaazonosító már létezik"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "A megadott mappanév nem jó: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nem sikerült megnyitni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Végzetes levélértelmezési hiba %ld pozíció közelében a(z) %s mappában"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nem sikerült ellenőrizni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nem sikerült megnyitni ezt a fájlt: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nem sikerült megnyitni az ideiglenes postafiókot: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nem sikerült lezárni a forrásmappát %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nem sikerült bezárni ezt az ideiglenes mappát: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem sikerült átnevezni ezt a mappát: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Az összefoglaló és a mappa eltér, még egyeztetés után is"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nem sikerült tárolni ezt a mappát: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Hiba az ideiglenes postafiók írása közben: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Sikertelen írási művelet az ideiglenes postafiókba: %s: %s"
@@ -10599,10 +10679,17 @@ msgstr "MH levél hozzáfűzése megszakítva"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nem sikerült létrehozni a mappát: `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' nem könyvtár."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10624,6 +10711,29 @@ msgstr "A(z) `%s' spool nem közönséges fájl vagy könyvtár"
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' mappa nem létezik."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nem sikerült megnyitni '%s' mappát:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "`%s' mappa nem létezik."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nem sikerült létrehozni a mappát: `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10860,47 +10970,47 @@ msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nem lehet a mappát a saját almappájába áthelyezni."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nincs ilyen mappa: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nem sikerült a csoportot letölteni: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nem sikerült elküldeni a levelet: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Az NNTP-parancs sikertelen: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Új üzenetek keresése"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ismeretlen válasz a kiszolgálótól: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Felhasználó megszakította"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Művelet sikertelen: %s"
@@ -10947,7 +11057,7 @@ msgstr "Törlés a kiszolgálóról %s nap múlva"
 msgid "Disable support for all POP3 extensions"
 msgstr "Az összes POP3-kiterjesztés tiltása"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11039,7 +11149,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs `%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11092,7 +11202,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levélküldés a sendmail programon keresztül"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11258,7 +11368,7 @@ msgstr "SMTP-levélküldés %s kiszolgálón át"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nem lehet elküldeni a levelet: a feladó címe érvénytelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Levél küldése"
 
@@ -11365,34 +11475,34 @@ msgstr "Időtúllépés az QUIT kérésnél: %s"
 msgid "QUIT response error"
 msgstr "Hibás QUIT válasz"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f K"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "melléklet"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Eltávolítja a kiválasztott elemeket a mellékletlistáról"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Csatolás..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Fájl csatolása a levélhez"
 
@@ -11510,19 +11620,19 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Attach file(s)"
 msgstr "Fájl csatolása"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11531,30 +11641,30 @@ msgstr ""
 "Fájlbeolvasási hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "A fájl létezik, felülírod?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fájlmentési hiba: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fájlbetöltési hiba: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fájlelérési hiba: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11563,7 +11673,7 @@ msgstr ""
 "Nem sikerült keresni a fájlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11572,7 +11682,7 @@ msgstr ""
 "Nem sikerült csonkolni a  fájlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11581,7 +11691,7 @@ msgstr ""
 "Nem sikerült másolni a fájlleírót: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11590,7 +11700,7 @@ msgstr ""
 "Hiba a levelek automatikus mentése közben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11600,7 +11710,7 @@ msgstr ""
 "fájlokat.\n"
 "Szeretnéd megkísérelni a visszaállításukat?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11611,43 +11721,43 @@ msgstr ""
 "\n"
 "Szeretnéd menteni a változtatásokat?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Figyelem: Módosított levél"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Aláírás:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automatikusan létrehozott"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Levél írása"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11655,7 +11765,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "Nem lehetett aktiválni a címkiválasztó kontrollt."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11667,7 +11777,7 @@ msgstr ""
 "Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
 "libgtkhtml van-e telepítve.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11675,7 +11785,7 @@ msgstr ""
 "Nem sikerült létrehozni a szerkesztőablakot:\n"
 "A HTML-szerkesztő komponens aktiválása sikertelen."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12029,7 +12139,7 @@ msgstr "Akkor"
 msgid "You must specify a folder."
 msgstr "Meg kell adnod egy mappát."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Mappa kiválasztása"
@@ -12044,19 +12154,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Fontos"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Teendő"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Később"
 
@@ -12144,7 +12254,7 @@ msgstr ""
 "A levél dátuma a szűrő futtatásakor aktuális\n"
 "dátummal lesz összehasonlítva."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuális mappák"
 
@@ -12160,7 +12270,7 @@ msgstr "óta"
 msgid "months"
 msgstr "hónap"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "másodperc"
 
@@ -12330,7 +12440,7 @@ msgstr "nem megjelölt"
 msgid "Junk Test"
 msgstr "június"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Címke"
@@ -12438,9 +12548,10 @@ msgstr "kezdete"
 msgid "Stop Processing"
 msgstr "Feldolgozás leállítása"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Tárgy"
 
@@ -12448,25 +12559,25 @@ msgstr "Tárgy"
 msgid "Unset Status"
 msgstr "Állapot nincs beállítva"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "A(z) %s szabály megnevezés nem egyedi, kérlek válassz másikat."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Szabályok"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Szabály hozzáadása"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Szabály szerkesztése"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Szabály neve"
 
@@ -12506,15 +12617,15 @@ msgstr "A tárgy tartalmazza"
 msgid "Subject does not contain"
 msgstr "A tárgy nem tartalmazza"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Meg kell adnod a vmappa nevét."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Legalább egy mappát meg kell adnod, mint forrást."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "VMappa-forrás"
 
@@ -12567,9 +12678,9 @@ msgstr "Evolution Levelező mappamegjelenítő"
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Levél"
 
@@ -12577,7 +12688,7 @@ msgstr "Levél"
 msgid "Mail Accounts"
 msgstr "Postafiókok"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Levelezés beállításai"
 
@@ -12615,15 +12726,15 @@ msgstr "Meg kell adnod egy érvényes parancsfájlnevet."
 msgid "[script]"
 msgstr "[parancsfájl]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Nyelv(ek)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Parancsfájl-aláírás hozzáadása"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Aláírás(ok)"
 
@@ -12710,7 +12821,6 @@ msgid "Unread messages"
 msgstr "_Következő olvasatlan levél"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kiválasztásához>"
 
@@ -12718,310 +12828,327 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Create New Folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Mappanév:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VMappák"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Beérkezett levelek"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Válassz mappát"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nem sikerült törölni a mappát: `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" törlése"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" mappa átnevezése erre:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Mappa átnevezése"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Már létezik \"%s\" nevű mappa. Használj más nevet."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Megnyitás új ablakban"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Áthelyezés"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztés új levélként..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Válasz a _listának"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Válasz _mindenkinek"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Továbbítás"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Követés..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Befejezve _Jelölő"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Jelölő törlése"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Visszaállítás"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Á_thelyezés mappába..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Másolás mappába..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "_Szűrők alkalmazása"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "S_zabály gyártása levélből"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VMappa a _tárgyra"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _címzettekre"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelezőlistára"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Szű_rő a tárgyra"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Szűrő a f_eladóra"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Szűrő a _címzettekre"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Szűrő a f_eladóra"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Levél nyomtatása"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Hivatkozás címének másolása"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kattints ide új feladat hozzáadásához"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Találatok:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Hozzárendelve"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Aláírás szerkesztése"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Aláírás mentése"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13030,84 +13157,84 @@ msgstr ""
 "Az input_token érvénytelen aláírást tartalmaz, vagy az aláírás nem "
 "ellenőrizhető."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Megszakítva"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP titkosítás"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "A tanúsítvány még nem érvényes"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Lejárt elemek:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Megtekintés beágyazva"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Elrejtés"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
@@ -13151,29 +13278,34 @@ msgstr "Mutató ismeretlen külső adatra (\"%s\" típus)"
 msgid "Formatting message"
 msgstr "Levelek áthelyzése"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Feladó"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Rejtett másolat"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Levelező"
 
@@ -13187,8 +13319,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13206,21 +13338,26 @@ msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként.
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Nem támogatott séma"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nem lehet ellenőrizni a levél aláírását"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Nem lehet ellenőrizni a levél aláírását"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13232,60 +13369,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nem sikerült feloldani a gépnevet: `%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Mentés másként..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Névtelen levél"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hivatkozás megnyitása böngészőben"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Ü_zenet küldése a listának..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyitás ezzel: %s..."
@@ -13334,18 +13471,18 @@ msgstr "Szűrők"
 msgid "-------- Forwarded Message --------"
 msgstr "Továbbított levél"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13354,7 +13491,7 @@ msgstr ""
 "Nem sikerült menteni: `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13363,32 +13500,38 @@ msgstr ""
 "`%s' már létezik.\n"
 "Felülírod?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Üzenet"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Levél mentése másként..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Cím"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "A feladó %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13401,7 +13544,7 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a leveleket?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13427,319 +13570,327 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "A levél alapértelmezett tárgya"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "A levél alapértelmezett tárgya"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Szöveg keresése a megjelenített levél törzsében"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "_Továbbítás stílusa:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "A levél alapértelmezett tárgya"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "A levél alapértelmezett tárgya"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "_Válasz stílusa:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Megjelenjen-e a mappasáv"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Megjelenjen-e a mappasáv"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Postafiókok"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Művelet végrehajtása,"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Értesítés új levélről"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Értesítés új levélről"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "HTML levél küldése?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "HTML levél küldése?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Animált képek megjelenítése"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Animált képek megjelenítése"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Levél megjelenítése a szokásos stílusban"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Betekintő ablaktábla"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminál betűkészlete:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Változó szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13747,172 +13898,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Téma szerinti levéllista"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Téma szerinti levéllista"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importálás"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-importáló"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Az Evolution importálja a régi Elm-leveleket."
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importálás folyamatban..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Várj"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s importálása %s-ként"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s pásztázása"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Fájlok importálása"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13920,16 +14068,44 @@ msgstr ""
 "Az Evolution Elm levélfájlokat talált.\n"
 "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Mappa törlése"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Válassz importálót"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importálás folyamatban"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Fájlok importálása"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "%s pásztázása"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritásszűrő \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13955,7 +14131,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:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13968,7 +14144,7 @@ msgstr ""
 "támogat az Evolution.\n"
 "Ezek a szűrők elvetésre kerülnek."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13982,31 +14158,24 @@ msgstr ""
 "ellenőrzik, hogy az adott karakterláncot tartalmazzák-e a \n"
 "levelek vagy sem."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "A levélszűrők beolvasása"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Mappa pásztázása"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Importálás kezdete"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Beállítások"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Levélszűrők"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14014,11 +14183,20 @@ msgstr ""
 "Az Evolution Netscape levélfájlokat talált.\n"
 "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Az Evolution importálja a régi Pine adatokat."
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Fájlok importálása"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Címjegyzék"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14026,7 +14204,7 @@ msgstr ""
 "Az Evolution Pine levélfájlokat talált.\n"
 "Szeretnéd ezeket az Evolutionbe importálni?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14069,19 +14247,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Nem adtad meg az összes szükséges információt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafiók-szerkesztő"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Gép:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Ú_tvonal:"
 
@@ -14133,28 +14311,43 @@ msgstr ""
 "eltávolított mappa használatban van\n"
 "és frissítve lett."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Vannak el nem küldött levelek. Biztosan kilépsz?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Új levél"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Levél"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Új levél írása"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Új VMappa"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Levélszűrők"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Új mappa létrehozása"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Az URI, amit a naptár megjelenít"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Azonosító"
 
@@ -14198,7 +14391,7 @@ msgstr ""
 "nem tudod, hogy milyen protokollt kell használnod, kérdezd meg a "
 "rendszergazdát vagy az internetszolgáltatót."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Postafiók-kezelés"
 
@@ -14224,121 +14417,116 @@ msgid "Connecting to server..."
 msgstr "Kapcsolódás a kiszolgálóhoz..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Támogatott típusok lekérdezése"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Postafiók-szerkesztő"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Postafiók adatai"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "_Parancsfájl hozzáadása"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Új aláírás hozzáadása..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Mindig küldjön rejtett másolatot (Bcc) ide:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Mindig küldjön másolatot (Cc) ide:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Titkosításkor mindig megbízom a kulcskarikámon található kulcsokban."
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Eredeti levél csatolása"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Melléklet"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Hitelesítés"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Karakterkészlet:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "S_zínek"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Helyesírás-ellenőrzés _beírás közben"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Ro_sszul írt szavak színe:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Levél írása"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Beállítások"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14354,144 +14542,140 @@ msgstr ""
 "\n"
 "Kattints az \"Alkalmaz\" gombra a beállítások mentéséhez."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Alapértelmezett"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Alapértelmezett viselkedés"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Alapértelmezett karakterkódolás: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Levél törlése"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Ne idézze az eredeti levelet"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitás esetén)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Kész"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Postafiókok"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-mail _cím:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafiók varázsló"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Parancs végrehajtása..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Fix szélességű:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Szűrők"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Betűk beállításai"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Üzenetek _HTML formázása"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Élőfej"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Idézetek kiemelése"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Beágyazott"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Címkék és színek"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Képek betöltése"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Levelezés beállítása"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Postafiók helye"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Levélszerkesztő"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Levél megjelenítése"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Levél betűje"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Értesítés új levélről"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14499,140 +14683,140 @@ msgstr ""
 "Megjegyzés: az első bejelentkezésig nem kapsz semmilyen figyelmeztetést a "
 "jelszó megadására."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Egyéb információ"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "S_zervezet:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _kulcs azonosítója:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Szín kiválasztása"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Nyomtatásnál használt betűk"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Eredeti levél idézése"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Idézet"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Vá_laszcím:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Levelek fogadása"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Fogadás beállításai"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Kötelező adatok"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Alapértékek"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Biztonság"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Biztonságos MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Fix szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Fix szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Változó szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Változó szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Levél küldése"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "El_küldött levelek mappája"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Elküldött levelek és piszkozatok"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolgáló megköveteli a _hitelesítést"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Kiszolgáló beállítása"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Kiszolgáló _típusa: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "_Fájlnév megadása:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Szabványos Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14641,7 +14825,7 @@ msgstr ""
 "Ennek a parancsfájlnak a kimenete lesz az aláírásod.\n"
 "Az itt megadott név csak megjelenítés célját szolgálja."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14651,7 +14835,7 @@ msgstr ""
 "azok a nyelvek vannak felsorolva, amelyekhez van telepítve helyesírás-"
 "ellenőrző szótár."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14659,15 +14843,15 @@ msgstr ""
 "Írd be azt a nevet, amellyel hivatkozni szeretnél erre a postafiókra.\n"
 "Például: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14677,174 +14861,174 @@ msgstr ""
 "\n"
 "A folytatáshoz kattints a \"Következő\" gombra."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Aláírás hozzáadása"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Mindig töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Hitelesítési típus:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Hitelesítési típus:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Hangulatjelek képeinek automatikus beillesztése"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Hangjelzés új levél beérkezésekor"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Megerősítés a mappa tisztításakor"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Alapértelmezett aláírás:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne értesítsen, ha új levél érkezik"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Továbbítás stílusa:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Teljes név:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML-levél"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Személyazonosság"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "június"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Képek betöltése, ha a feladó szerepel a címjegyzékben"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Várakozás a levél olvasottként megjelölése előtt:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Név:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Soha ne töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Kérdez, ha ü_res tárggyal akarod elküldeni a levelet"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Levelek fogadása"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Válasz stílusa:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Parancsfájl:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Törlés..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Levél küldése"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Animált képek megjelenítése"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Aláírás"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standard betűkészlet:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminál betűkészlete:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_A többi alkalmazás által használt betűkészlet használata"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "leírás"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingelése"
@@ -14867,7 +15051,7 @@ msgstr ""
 "Hiba a művelet végrehajtása közben:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Várj"
 
@@ -14879,12 +15063,12 @@ msgstr "Mappa szűrése"
 msgid "Fetching Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nem sikerült alkalmazni a kimenő szűrőket: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14893,116 +15077,116 @@ 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:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' küldése"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d üzenet küldése"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Hiba a %d / %d üzenetnél"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Kész."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Levél mentése a mappába"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása \"%s\"-ben"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Továbbított levelek"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "%s tároló megnyitása"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Mappa frissítése"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Mappa tisztítása"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Kuka ürítése: '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Helyi mappák"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levél letöltése"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d levél letöltése"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d levél mentése"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15011,7 +15195,7 @@ msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15020,11 +15204,11 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Melléklet mentése"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15033,22 +15217,22 @@ msgstr ""
 "Nem lehet létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Szétkapcsolódás %s kiszolgálóval"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Újrakapcsolódás %s kiszolgálóhoz"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15084,38 +15268,38 @@ msgstr "Kivételek"
 msgid "Security Information"
 msgstr "Postafiók adatai"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Megszakítás..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Kiszolgáló: %s,  Típus: %s "
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Útvonal: %s, Típus: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Levelek küldése és fogadása"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Mindent megszakít"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Frissítés..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Várakozás..."
 
@@ -15224,20 +15408,20 @@ msgstr ""
 "    '%s'\n"
 "és frissítve lettek."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vMappák"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "VMappa szerkesztése"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "A nem létező '%s' vmappát próbálod szerkeszteni."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Új VMappa"
 
@@ -15568,97 +15752,20 @@ msgstr "\"Kapcsolat nélküli\" mappák"
 msgid "Autocompletion Folders"
 msgstr "Névkiegészítési mappák"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Nem sikerült a mappa másolása: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Nem sikerült a mappa áthelyezése: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Nem sikerült a mappát önmagára áthelyezni."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Nem sikerült mappát önmagára másolni."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Nem lehet a mappát a saját almappájába áthelyezni."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Add meg a mappát, amelybe \"%s\" mappát másolod:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Mappa másolása"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Add meg a mappát, amelybe \"%s\" mappát áthelyezed:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Mappa áthelyezése"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Nem sikerült törölni a mappát:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Nem sikerült átnevezni a mappát:\n"
+"Nem sikerült elkészíteni a megadott mappát:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "A megadott mappanév nem jó: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "A kiválasztott mappa nem tartozik egyetlen felhasználóhoz sem"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nem sikerült eltávolítani a mappát:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Nem sikerült elkészíteni a megadott mappát:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Névtelen)"
@@ -15803,7 +15910,7 @@ msgstr "A gpg végrehajtása sikertelen."
 msgid "_Import"
 msgstr "Importálás"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Kapcsolatok bezárása..."
 
@@ -15841,6 +15948,10 @@ msgstr "Nem sikerült megnyitni a megosztott mappát: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "A megadott megosztott mappa nem található."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Importálás kezdete"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15950,123 +16061,6 @@ msgstr "A beállítások adatbázisa nem található"
 msgid "Generic error"
 msgstr "Általános hiba"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Új indítóikon-csoport létrehozása"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Csoport neve:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Tényleg eltávolítod a(z) \"%s\" csoportot az indítósávról?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Indítóikon-csoport átnevezése"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "A kijelölt indítóikon-csoport átnevezése erre:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Kis ikonok"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Kis ikonok megjelenítése az elemeken"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Nagy ikonok"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Nagy ikonok megjelenítése az elemeken"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "Csoport _hozzáadása..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Új indítócsoport létrehozása"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Csoport eltávolítása..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Indítócsoport eltávolítása az indítósávról"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "C_soport átnevezése..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Indítóikon-csoport átnevezése"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Indítósáv el_rejtése"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Indítósáv elrejtése"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "_Alapértelmezett indítóikonok létrehozása"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Alapértelmezett indítóikonok létrehozása"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Indítóikon átnevezése"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Indítóikon-csoport átnevezése erre:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Az indítóikonhoz tartozó mappa megnyitása"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Megnyitás új _ablakban"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Az indítóikonhoz tartozó mappa megnyitása új ablakban"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Indítóikon-csoport átnevezése"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Eltávolítás"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Indítóikon eltávolítása az indítósávról"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Nem sikerül elmenteni az elemeket."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Indítóikonok"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Jelölőnégyzet"
@@ -16077,11 +16071,6 @@ msgstr "Jelölőnégyzet"
 msgid "New"
 msgstr "Új"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" \"%s\"-ben"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16381,59 +16370,59 @@ msgstr ""
 "egyszerre\n"
 "--Haználd a(z)%s --help parancsot további információk eléréséhez\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Válassz importálót"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Folyamatjelző"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Kifejezés"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-mail cím összefésülése"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "A tanúsítvány lejárt: %s\n"
 "Kibocsátó: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Írd be %s jelszavát"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16502,7 +16491,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Tanúsítványazonosító:"
@@ -16577,11 +16566,11 @@ msgstr "Szervezeti egység"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16630,239 +16619,239 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "A kártyaazonosító már létezik"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr "°C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "É"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "É"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Visszavont Tanúsítvány"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Nem megbízható tanúsítvány"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "Azonosító"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "A téma %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nem sikerült feldolgozni a spool mappát"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nincs információ"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "melléklet"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Észak-Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Kifejezés"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s-kor"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Beszúrás"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "A téma %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Írd be %s jelszavát"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Tanúsítványazonosító:"
@@ -17463,7 +17452,8 @@ msgid "_Threaded Message List"
 msgstr "_Téma szerinti levéllista"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17471,7 +17461,8 @@ msgid "A_pply Filters"
 msgstr "_Szűrők alkalmazása"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Feladó hozzáadása a címjegyzékhez"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17925,10 +17916,6 @@ msgstr "For_mátum"
 msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Megnyitás"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Fájl megnyitása"
@@ -18299,22 +18286,6 @@ msgstr "_Küldés / Fogadás"
 msgid "_Window"
 msgstr "_Keresés most"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Összefoglaló nyomtatása"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Összefoglaló nyomtatása"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Frissítés"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Nézet újrabetöltése"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Cég szerint"
@@ -18381,8 +18352,8 @@ msgstr "_Kategóriákkal"
 msgid "_Tasks"
 msgstr "_Feladatok"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18628,23 +18599,23 @@ msgstr "_Keresés"
 msgid "_Find Now"
 msgstr "_Keresés most"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Törlés"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Tétel azonosító"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Altétel azonosító"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Szöveg"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Keresés most"
@@ -18659,6 +18630,206 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kész)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Címjegyzék forrásai"
+
+#~ msgid "No data provided"
+#~ msgstr "Nincs adatszolgáltatás"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült megnyitni a fájlt: `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült létrehozni %s könyvtárat:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült létrehozni a fájlt: `%s'\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' nem könyvtár."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "%s importálása %s-ként"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "A levélszűrők beolvasása"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Mappa pásztázása"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Nem sikerült a mappa másolása: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Nem sikerült a mappa áthelyezése: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Nem sikerült a mappát önmagára áthelyezni."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Nem sikerült mappát önmagára másolni."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Nem lehet a mappát a saját almappájába áthelyezni."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Add meg a mappát, amelybe \"%s\" mappát másolod:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Mappa másolása"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Add meg a mappát, amelybe \"%s\" mappát áthelyezed:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Mappa áthelyezése"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült törölni a mappát:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült átnevezni a mappát:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "A kiválasztott mappa nem tartozik egyetlen felhasználóhoz sem"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült eltávolítani a mappát:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Új indítóikon-csoport létrehozása"
+
+#~ msgid "Group name:"
+#~ msgstr "Csoport neve:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Tényleg eltávolítod a(z) \"%s\" csoportot az indítósávról?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Indítóikon-csoport átnevezése"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "A kijelölt indítóikon-csoport átnevezése erre:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Kis ikonok"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Kis ikonok megjelenítése az elemeken"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Nagy ikonok"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Nagy ikonok megjelenítése az elemeken"
+
+#~ msgid "_Add Group..."
+#~ msgstr "Csoport _hozzáadása..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Új indítócsoport létrehozása"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Csoport eltávolítása..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Indítócsoport eltávolítása az indítósávról"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "C_soport átnevezése..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Indítóikon-csoport átnevezése"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Indítósáv el_rejtése"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Indítósáv elrejtése"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "_Alapértelmezett indítóikonok létrehozása"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Alapértelmezett indítóikonok létrehozása"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Indítóikon átnevezése"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Indítóikon-csoport átnevezése erre:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Az indítóikonhoz tartozó mappa megnyitása"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Megnyitás új _ablakban"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Az indítóikonhoz tartozó mappa megnyitása új ablakban"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Indítóikon-csoport átnevezése"
+
+#~ msgid "Re_move"
+#~ msgstr "_Eltávolítás"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Indítóikon eltávolítása az indítósávról"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Nem sikerül elmenteni az elemeket."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Indítóikonok"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" \"%s\"-ben"
+
+#~ msgid "Print Summary"
+#~ msgstr "Összefoglaló nyomtatása"
+
+#~ msgid "Print summary"
+#~ msgstr "Összefoglaló nyomtatása"
+
+#~ msgid "Reload"
+#~ msgstr "Frissítés"
+
+#~ msgid "Reload the view"
+#~ msgstr "Nézet újrabetöltése"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Másolás mappába..."
 
@@ -18753,21 +18924,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Evolution is now exiting ..."
 #~ msgstr "Az Evolution most kilép..."
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolution LDIF-importáló"
-
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "LDAP adatcserélő formátum (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolution VCard-importáló"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolution VCard-importáló"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Primary"
 #~ msgstr "Elsődleges"
 
@@ -26858,9 +27014,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Appointments"
 #~ msgstr "Találkozók"
 
-#~ msgid "No appointments."
-#~ msgstr "Nincsenek találkozók."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27365,9 +27518,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Moderate mist"
 #~ msgstr "Közepes sűrűségű köd"
 
-#~ msgid "Thick mist"
-#~ msgstr "Sűrű köd"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Gyenge köd"
 
@@ -28060,9 +28210,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Új ablak megnyitása ehhez a mappához"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Mappa törlése"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Másik mappa megjelenítése"
 
diff --git a/po/it.po b/po/it.po
index 811d160de0..454f026944 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-01-28 15:06+0100\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -51,8 +51,7 @@ msgstr "Configura qui l'autocompletamento"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contatti"
 
@@ -93,19 +92,20 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr "Gestione dei certificati S/Mime"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "L'agenda '%s' sarà rimossa. Sei sicuro di voler continuare?"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Nuova rubrica"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -113,65 +113,65 @@ msgstr "Nuova rubrica"
 msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Proprietà..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nuova elenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "E_lenco contatti"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Crea un nuovo elenco contatti"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Connessione al server LDAP non riuscita"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "L'autenticazione con il server LDAP non riuscita"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Impossibile eseguire interrogazione su DSE Root"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Errore nel caricare le informazioni di schema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Il server non risponde con informazioni di schema valide"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "In migrazione..."
 
@@ -188,39 +188,41 @@ msgstr ""
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrazione di `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Su questo computer"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personale"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Su server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Impostazioni autocompletamento"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -233,7 +235,7 @@ msgstr ""
 "più specifica o aumentare il limite di risultati nelle preferenze \n"
 "del server di elenchi per questa rubrica."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -245,22 +247,22 @@ msgstr ""
 "la ricerca più specifica o elevare il limite di tempo del\n"
 "server di elenchi nelle preferenze di questa rubrica."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Questa interrogazione non è stata completata con successo."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -268,7 +270,7 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che il percorso esista e che "
 "si abbia il permesso di accedervi."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -276,7 +278,7 @@ msgstr ""
 "Impossibile aprire questa rubrica.  Questo significa che è stata inserita "
 "una URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -286,7 +288,7 @@ msgstr ""
 "LDAP con Evolution è necessario compilare il programma dai sorgenti CVS dopo "
 "aver scaricato Open LDAP dal collegamento sottostante."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -294,27 +296,32 @@ msgstr ""
 "Impossibile aprire questa rubrica. Questo significa che è stata inserita una "
 "URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubrica"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accesso anonimo al server LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Autenticazione non riuscita.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sInserire la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID della sorgente contatti che la vista mostrerà"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "La URI che il calendario visualizzerà"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList xml per l'elenco del completamento delle uri"
@@ -361,7 +368,7 @@ msgstr "  Mostra basi supportate"
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -393,19 +400,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Assistente alla creazione della rubrica"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Proprietà della rubrica"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Sorgenti della rubrica"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Sorgenti della rubrica..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Sempre"
 
@@ -416,7 +426,8 @@ msgstr "Anonimamente"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -425,51 +436,51 @@ msgstr ""
 "Premere il tasto \"Fine\" per salvare le impostazioni \n"
 "inserite sino a questo punto."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Nome distintivo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Indirizzo Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution utilizzerà questo DN per autenticarsi con il server"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution utilizzerà questo indirizzo Email per autenticarsi con il server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Finito"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Gruppo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Mai"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -484,23 +495,23 @@ msgstr ""
 "connessione. \n"
 "Chiedere all'amministratore se il server LDAP usa questi protocolli."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Uno"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Campo della ricerca: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Ricerca in corso"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Selezionato:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -510,7 +521,7 @@ msgstr ""
 "LDAP solo se\n"
 "il server LDAP supporta SSL o TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -528,7 +539,7 @@ msgstr ""
 "connessione è già\n"
 "sicura."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -542,7 +553,7 @@ msgstr ""
 "vulnerabili\n"
 "ad attacchi alla sicurezza del sistema."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -553,40 +564,42 @@ msgstr ""
 "Evolution per\n"
 "le ricerche e per la creazione e modifica dei contatti."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Specificare un nome da mostrare ed un gruppo è l'ultimo passo necessario per "
 "la configurazione di una rubrica."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Passo 1: caratteristiche della cartella"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Passo 2: informazioni sul server"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Passo 3: connessione al server"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Passo 4: ricerca della directory"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Basi di ricerca supportate"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -598,7 +611,7 @@ msgstr ""
 "nelle ricerche e la durata di una ricerca. Per cambiarle rivolgersi \n"
 "all'amministratore di sistema."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -610,7 +623,7 @@ msgstr ""
 "Lasciando in bianco questo campo, la ricerca comincerà alla radice "
 "dell'albero delle directory."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -626,11 +639,13 @@ msgstr ""
 "Un'ampiezza di ricerca di \"uno\" includerà solo le voci un livello sotto la "
 "base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -641,7 +656,7 @@ msgstr ""
 "l'amministratore di sistema se serve aiuto per cercare questo tipo\n"
 "di informazioni."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -649,16 +664,17 @@ msgstr ""
 "Questo è il nome completo del server ldap. Per esempio \"ldap.miazienda.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Questo è il numero massimo di voci da scaricare. L'impostazione di un \n"
 "valore troppo grande rallenterà la rubrica."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -668,7 +684,7 @@ msgstr ""
 "impostare questo come \"indirizzo Email\" richiede accesso anonimo al server "
 "ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -678,7 +694,7 @@ msgstr ""
 "Evolution.\n"
 "Serve solo allo scopo di visualizzarlo."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -687,7 +703,7 @@ msgstr ""
 "Questo è il nome che apparirà nell'elenco delle cartelle di Evolution.\n"
 "Serve solo allo scopo di visualizzarlo."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -700,28 +716,28 @@ msgstr ""
 "di \n"
 "sistema quale porta si dovrà specificare."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Quest'opzione determina la durata di una ricerca."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "U_sa SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Uso nome distintivo (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Uso indirizzo Email"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Quando è possibile"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -733,19 +749,19 @@ msgstr ""
 "Chiedere all'amministrazione di sistema se non si è sicuri di queste "
 "informazioni."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Mostra il nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Limite di _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -754,39 +770,39 @@ msgstr "Limite di _download:"
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Metodo di identificazione:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Porta numero:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Base della ricerca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Nome del _server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "scheda-connessione"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "scheda-generale"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "scheda-ricerca"
 
@@ -901,7 +917,7 @@ msgstr "Collaborazione"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor dei contatti"
 
@@ -995,10 +1011,10 @@ msgstr "Ca_tegorie..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1046,15 +1062,15 @@ msgid "_Web page address:"
 msgstr "Indirizzo pagina _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Indirizzo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2038,102 +2054,111 @@ msgid "AOL Instant Messenger"
 msgstr "Messenger AOL"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "GroupWise Novell"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Messenger Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Messenger MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Servizio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Posizione"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Nome utente"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Casa"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Lavoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Libro sorgente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Libro oggetto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Contatto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Campi scrivibili"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Cambiato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nome account"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Editor delle categorie non disponibile."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Salva contatto come vcard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2141,7 +2166,7 @@ msgstr ""
 "Cancellare\n"
 "questi contatti?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2149,46 +2174,51 @@ msgstr ""
 "Cancellare\n"
 "questo contatto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Ufficio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "GroupWise Novell"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Aggiunta veloce di un contatto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "Modifica interamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Nome e cognome:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-mail:"
 
@@ -2345,11 +2375,11 @@ msgid "Is New List"
 msgstr "È un nuovo elenco"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor dell'elenco dei contatti"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Salva elenco come vcard"
 
@@ -2438,13 +2468,13 @@ msgid "Email begins with"
 msgstr "L'Email comincia per"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoria è"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
@@ -2461,101 +2491,100 @@ msgid "Type"
 msgstr "Tipo"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Rubrica"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salva come vcard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Nuovo contatto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nuovo elenco contatti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Vai alla cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Cerca contatti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Sorgenti della rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Impostazioni Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Contatto precedente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Invia un messaggio al contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Stampa busta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Taglia"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Incolla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Vista corrente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2568,8 +2597,8 @@ msgstr ""
 "Evolution"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Qualunque categoria"
 
@@ -2612,7 +2641,7 @@ msgid "Company Phone"
 msgstr "Telefono ditta"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2671,7 +2700,7 @@ msgid "Nickname"
 msgstr "Nickname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Note"
 
@@ -2680,7 +2709,7 @@ msgid "Office"
 msgstr "Ufficio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizzazione"
 
@@ -2806,67 +2835,73 @@ msgstr "Selezionato"
 msgid "Has Cursor"
 msgstr "Ha il cursore"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Elenco membri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Lavoro"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Descrizione"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "URL della _video conferenza:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Telefono auto"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personale"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Qualifica"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Pagina web"
 
@@ -2875,8 +2910,8 @@ msgid "Success"
 msgstr "Completato"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2906,7 +2941,7 @@ msgstr "Protocollo non supportato"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2926,7 +2961,8 @@ msgid "TLS not Available"
 msgstr "TLS non disponibile"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "La rubrica non esiste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3061,7 +3097,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Aggiungi indirizzo al contatto esistente \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Interrogazione rubrica..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3116,17 +3153,40 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Questo dovrebbe controllare il rinfresco delle voci immagini"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Importatore Elm di Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Importatore dell' iCalendar di Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Importatore del vCalendar di Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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 "Stampa busta"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Stampa i contatti"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Stampa contatto"
 
@@ -3218,7 +3278,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3400,8 +3460,8 @@ msgstr "Non è stato fornito un nome di file."
 msgid "Unnamed List"
 msgstr "Elenco senza nome"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Inserire la password"
 
@@ -3478,10 +3538,9 @@ msgid "Evolution's Tasks component"
 msgstr "Componente delle attività di Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Attività"
 
@@ -3525,26 +3584,26 @@ msgstr "Suoneria (minuti)"
 msgid "_Edit appointment"
 msgstr "_Modifica appuntamenti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Apri"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Apri"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "_Abbandona"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "Abbandona _tutto"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3557,12 +3616,12 @@ msgstr ""
 "Inizia da %s\n"
 "Finisce a %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Attenzione"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3574,7 +3633,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3591,19 +3650,19 @@ msgstr ""
 "\n"
 "Si vuole davvero eseguire questo programma?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Non chiedere più su questo programma in futuro."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Impossibile inizializzare gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la fabbrica per il servizio di notifica dell'avviso sonoro"
@@ -3741,24 +3800,30 @@ msgstr "Mostra l'ora in formato di 24h o usando am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Mostra i numeri delle settimane nel navigatore date"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Il sommario contiene"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descrizione contiene"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Il commento contiene"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "La descrizione contiene"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -3788,7 +3853,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3810,70 +3875,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Il calendario '%s' sarà rimosso. Sei sicuro di voler continuare?"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nuovo calendario"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Riunion_e"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Crea una nuova richiesta di riunione"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Nuovo appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Crea un nuovo appuntamento giornaliero"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Nuovo calendario"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "C_alendario"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Impossibile aprire il calendario '%s' per creare eventi e appuntamenti"
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non c'è un calendario disponibile per creare eventi e appuntamenti"
 
@@ -4005,7 +4070,7 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Azione"
 
@@ -4077,7 +4142,7 @@ msgid "hour(s)"
 msgstr "ora(e)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -4088,7 +4153,7 @@ msgstr "inizio dell'appuntamento"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -4138,7 +4203,7 @@ msgstr "30 minuti"
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Allarmi"
 
@@ -4163,7 +4228,7 @@ msgid "Days"
 msgstr "Giorni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Abilita"
 
@@ -4303,7 +4368,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Generale"
 
@@ -4403,7 +4468,7 @@ msgstr ""
 "inserite sino a questo punto."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Nuovo elenco attività"
 
@@ -4570,23 +4635,23 @@ msgstr "%s non sono state effettuate modifiche. Aggiornare l'editor?"
 msgid "Validation error: %s"
 msgstr "Errore di validazione: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " a"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Completato "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Completato "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Scadenza "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Scadenza "
 
@@ -4622,8 +4687,8 @@ msgstr "Voce nell'agenda - %s"
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Salva come..."
 
@@ -4653,10 +4718,21 @@ msgstr "Destinatario"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Seleziona una sorgente di destinazione"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Calendario"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Nuovo elenco attività"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4765,7 +4841,7 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire delegato"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Appuntamento"
 
@@ -4789,23 +4865,32 @@ msgstr "Pianificazione"
 msgid "Meeting"
 msgstr "Riunione"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "La data scadenza è precedente alla data di inizio!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "La data iniziale è errata"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "La data finale è errata"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "L'ora iniziale è errata"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "L'ora finale è errata"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossibile aprire il calendario '%s'."
@@ -4881,29 +4966,29 @@ msgstr "_Ora di inizio:"
 #. 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nessuno"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "L'organizzazione selezionata non ha più un account"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "È richiesto un organizzatore."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "È richiesto almeno un partecipante."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delega a..."
 
@@ -5090,7 +5175,7 @@ msgstr "il"
 msgid "occurrences"
 msgstr "ricorrenze"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Data/ora"
 
@@ -5123,7 +5208,7 @@ msgid "_No recurrence"
 msgstr "_Nessuna ricorrenza"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Rimuovere"
 
@@ -5165,7 +5250,7 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "Non salvare"
 
@@ -5193,7 +5278,7 @@ msgstr ""
 "Le informazioni di questa attività sono cambiate.  Inviare una versione "
 "aggiornata?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "La data completata è errata"
 
@@ -5206,7 +5291,7 @@ msgstr "% _Completato"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Completato"
 
@@ -5219,7 +5304,7 @@ msgstr "Alta"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "In corso"
 
@@ -5238,7 +5323,7 @@ msgstr "Normale"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Da cominciare"
 
@@ -5277,16 +5362,16 @@ msgstr "Di base"
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "La data dovuta è errata"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "La data scadenza è precedente alla data di inizio!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossibile aprire le attività in '%s'."
@@ -5297,7 +5382,7 @@ msgstr "Con_fidenziale"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -5481,11 +5566,10 @@ msgstr "Inizio"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sommario"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "colore"
 
@@ -5510,7 +5594,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5545,10 +5629,10 @@ msgstr "No"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -5561,99 +5645,105 @@ msgstr "Ricorrente"
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Nuovo _appuntamento..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Nuovo _evento del giorno"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nuova attività"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Vai a _oggi"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Pubblica le informazioni sulla disponibilità"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Apri"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Copia"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Pianifica una riunione..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "Inoltra come iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa ricorrenza"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Elimina _tutte le ricorrenze"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Impostazioni..."
 
@@ -5740,7 +5830,7 @@ msgid "Alarms"
 msgstr "Avvisi sonori"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Completato"
 
@@ -5798,26 +5888,26 @@ msgstr "%02i divisioni per minuto"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5999,7 +6089,7 @@ msgid "Send Latest Information"
 msgstr "Invia informazioni correnti"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annulla"
@@ -6457,12 +6547,12 @@ msgstr "Priorità:"
 msgid "Web Page:"
 msgstr "Pagina web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Fare clic qui per aprire %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6472,7 +6562,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6483,12 +6573,12 @@ msgstr ""
 "%s\n"
 " è andato in crash."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Lettura attività a %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6497,28 +6587,38 @@ msgstr ""
 "Errore aprendo %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Caricamento attività"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Completamento azioni..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Rimozione degli oggetti selezionati..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Pulizia"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Caricamento attività"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Appuntamento - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6640,16 +6740,16 @@ msgstr "Informazioni sulla disponibilità (da %s a %s)"
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "È richiesta la propria partecipazione all'evento."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Inserire la password per %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6661,7 +6761,7 @@ msgstr ""
 "\n"
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6673,12 +6773,12 @@ msgstr ""
 "\n"
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Compleanni e anniversari"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Sul Web"
 
@@ -6867,49 +6967,49 @@ msgstr "Mese selezionato (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Anno selezionato (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Attività"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorità: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentuale completata: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorie: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Contatti: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Stampa elemento"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
@@ -6918,37 +7018,37 @@ msgstr "Impostazione pagina"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "L'elenco attività '%s' sarà rimosso. Sei sicuro di voler continuare?"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nuova attività"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Attività"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Crea una nuova attività"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Nuovo elenco attività"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "Elenco a_ttività"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Crea un nuovo elenco attività"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Impossibile aprire l'elenco attività '%s' per creare appuntamenti e riunioni"
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Non c'è un calendario accessibile per creare delle attività"
 
@@ -7006,20 +7106,20 @@ msgstr "File iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "File vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Pulizia dai vecchi appuntamenti e incontri"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Promemoria!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Eventi del Calendario"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7027,7 +7127,7 @@ msgstr ""
 "Evolution ha trovato i file di Calendario di Gnome.\n"
 "Si desidera importarli in Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Calendario di Gnome"
 
@@ -8690,7 +8790,7 @@ msgstr "Impossibile aprire il messaggio"
 msgid "Failed on message %d"
 msgstr "Errore al messaggio %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
@@ -8777,7 +8877,7 @@ msgstr "Copia messaggi in corso"
 msgid "Filtering new message(s)"
 msgstr "Filtraggio nuovi messaggi"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8788,15 +8888,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Analisi userid hint gpg non riuscita."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Analisi richiesta passphrase gpg non riuscita."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8805,32 +8905,28 @@ msgstr ""
 "È necessaria una passphrase per sbloccare la chiave\n"
 "per l'utente: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inaspettata da GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nessun dato fornito"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossibile cifrare: nessun destinatario valido specificato."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8841,61 +8937,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Impossibile elaborare con GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Esecuzione di gpg non riuscita: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Esecuzione di gpg non riuscita."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Questa parte del messaggio è firmata"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Impossibile verificare la firma del messaggio: formato messaggio non valido"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossibile generare i dati per la crittografia: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Questa parte del messaggio è cifrata"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Contenuto cifrato"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Impossibile elaborare i contenuti del messaggio"
 
@@ -9007,23 +9103,36 @@ msgstr "Impossibile decrittografare la parte MIME: struttura non valida"
 msgid "parse error"
 msgstr "Errore di analisi del testo"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Fornitore di cartelle Email virtuali "
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Impossibile caricare %s: Questo sistema non supporta il caricamento di un "
 "modulo."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Impossibile caricare %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Nessun fornitore disponibile per il protocollo `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimo"
@@ -9186,7 +9295,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Risposta di autenticazione dal server errata."
 
@@ -9325,20 +9434,7 @@ msgstr "Ricerca dell'host non riuscita: host non trovato"
 msgid "Host lookup failed: unknown reason"
 msgstr "Ricerca dell'host non riuscita: motivo sconosciuto"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Fornitore di cartelle Email virtuali "
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Nessun fornitore disponibile per il protocollo `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9403,22 +9499,26 @@ msgstr ""
 "Impossibile ottenere la cartella: operazione non supportata in questo "
 "archivio"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Impossibile creare la cartella: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: operazione non supportata in questo archivio"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: operazione non valida"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Cestino"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Da cestinare"
@@ -9649,21 +9749,31 @@ msgstr "Non é presente il messaggio %s in %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossibile rinominare la cartella %s: operazione non valida"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s: cartella inesistente"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "È impossibile copiare messaggi da una cartella NNTP!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "È impossibile copiare messaggi da una cartella NNTP!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9679,14 +9789,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Applicare filtri ai nuovi messaggi nella Inbox su questo server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronizza la posta remota localmente automaticamente"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Rubrica"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "Nome server LDAP:"
@@ -9705,44 +9811,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Per accedere ai server Groupwise Novell"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Password"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Predefinito"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "elenco"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si é disconnesso inaspettatamente: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9751,26 +9855,26 @@ msgstr ""
 "Avvertenza dal server IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "La risposta del server è terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
@@ -9785,7 +9889,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Cartella distrutta e ricreata sul server."
 
@@ -9794,12 +9898,12 @@ msgstr "Cartella distrutta e ricreata sul server."
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Impossibile la ricezione del messaggio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9815,25 +9919,25 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Questo messaggio non è al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -9888,27 +9992,37 @@ msgstr "Spazio per il Nome"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Applicare filtri ai nuovi messaggi nella INBOX su questo server"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "servizio IMAP per %s su %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9917,64 +10031,64 @@ msgstr "servizio IMAP per %s su %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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 "Connessione annullata"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Negoziazione SSL non riuscita"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Non è stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9985,13 +10099,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Non è presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Impossibile creare la cartella: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -9999,12 +10121,12 @@ msgstr ""
 "Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
 "\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartella madre sconosciuta: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non è permesso contenere sottocartelle"
 
@@ -10029,7 +10151,7 @@ msgstr ""
 "\n"
 " !!! DA NON USARE PER LA PRODUZIONE DI EMAIL !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Impossibile connettersi al server POP su %s"
@@ -10112,8 +10234,8 @@ msgstr ""
 "Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10125,55 +10247,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossibile rinominare la cartella '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Impossibile cancellare il sommario della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Impossibile aggiornare il sommario: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
@@ -10192,53 +10314,44 @@ msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile aprire la cartella `%s':\n"
-"%s "
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "La cartella `%s' non esiste."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile creare la cartella `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Impossibile creare la cartella: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' non è una directory maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "non è una directory maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10260,9 +10373,9 @@ msgid "Checking for new messages"
 msgstr "Verifica nuovi messaggi"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Salvataggio della cartella in corso"
@@ -10306,159 +10419,137 @@ msgstr "La cartella appare irrimediabilmente corrotta."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Costruziono del messaggio non riuscita: casella di posta corrotta?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Impossibile il file %s:\n"
-"%s "
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Impossibile creare una cartella con questo nome."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Impossibile creare la directory `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Impossibile allegare il file %s: non è un file regolare"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Impossibile creare il file `%s':\n"
+"Impossibile cancellare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non è un file regolare."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile cancellare la cartella `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La Cartella `%s' non è vuota.  Non cancellata."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Impossibile creare una cartella con questo nome."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Impossibile creare la directory `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Impossibile creare la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "La cartella esiste già"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Il nuovo nome della cartella è illegale."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Impossibile rinominare la cartella '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Impossibile rinominare %s con %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossibile aprire la cartella %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Errore fatale di simistamento della posta vicino alla posizione %ld nella "
 "cartella %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossibile controllare la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossibile aprire il file: %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Sommario e cartella non corrispondono, nemmeno dopo una sincronizzazione"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Impossibile memorizzare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella casella di posta temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Scrittura su casella di posta temporanea %s non riuscita: %s"
@@ -10472,10 +10563,17 @@ msgstr "Aggiunta di un messaggio MH annullata"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Impossibile creare la cartella `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' non è una directory."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Impossibile avere la cartella %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10497,6 +10595,29 @@ msgstr "La cartella di spool `%s' non è un file o una direcory normali"
 msgid "Folder `%s/%s' does not exist."
 msgstr "La cartella `%s/%s' non esiste."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Impossibile aprire la cartella `%s':\n"
+"%s "
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "La cartella `%s' non esiste."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Impossibile creare la cartella `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10745,46 +10866,46 @@ msgstr ""
 "Impossibile eliminare una cartella in un magazzino news: puoi invece "
 "disiscriverti."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Errore di connessione: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Non è presente la cartella: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Impossibile ricevere il gruppo: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Impossibile ricevere messaggi: errore non specificato"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Comando NNTP non riuscito: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Ricerca nuovi messaggi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Risposta del server  sconosciuta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Usa annulla"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operazione non riuscita: %s"
@@ -10831,7 +10952,7 @@ msgstr "Elimina dopo %s giorno(i)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Disabilita il supporto per tutte le estensioni POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10920,7 +11041,7 @@ msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10975,7 +11096,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11146,7 +11267,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non è valido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Invio messaggio"
 
@@ -11254,34 +11375,34 @@ msgstr "Richiesta QUIT scaduta: %s"
 msgid "QUIT response error"
 msgstr "Errore nella risposta di QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Rimuovi gli oggetti selezionati dall'elenco degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Aggiungi allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Allega un file al messaggio"
 
@@ -11398,14 +11519,14 @@ msgstr "fare clic qui per selezionare le cartelle a cui spedire"
 msgid "Attach file(s)"
 msgstr "File allegati"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Impossibile firmare i messaggi in uscita: nessun set di certificati "
 "impostato per questo account"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11413,7 +11534,7 @@ msgstr ""
 "Impossibile crittografare il messaggio in uscita: non è stato impostato "
 "nessun certificato di crittografazione per l'account"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11422,30 +11543,30 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11454,7 +11575,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11463,7 +11584,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11472,7 +11593,7 @@ msgstr ""
 "Impossibile copiare il descrittore di file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11481,7 +11602,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11490,7 +11611,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera recuperarli?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11501,43 +11622,43 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Attenzione: messaggio modificato"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Firma:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Autogenerata"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> file allegato"
 msgstr[1] "<b>%d</b> file allegati"
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Nascondi la barra _allegati (rilascia qua gli allegati)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Mostra la barra _allegati (rilascia qua gli allegati)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11545,7 +11666,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11557,7 +11678,7 @@ msgstr ""
 "Assicurarsi di aver installato la versione corretta\n"
 "di gtkhtml e libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11565,7 +11686,7 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "il componente HTML non è disponibile."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11920,7 +12041,7 @@ msgstr "Di"
 msgid "You must specify a folder."
 msgstr "È necessario indicare una cartella."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Scegli cartella"
@@ -11935,19 +12056,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Da fare"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Più tardi"
 
@@ -12035,7 +12156,7 @@ msgstr ""
 "La data del messaggio verrà confrontata\n"
 "con l'ora corrente all'utilizzo del filtro."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Cartelle virtuali"
 
@@ -12051,7 +12172,7 @@ msgstr "fa"
 msgid "months"
 msgstr "mesi"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr " secondi"
 
@@ -12220,7 +12341,7 @@ msgstr "non è segnato"
 msgid "Junk Test"
 msgstr "Test spazzatura"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etichetta"
@@ -12326,9 +12447,10 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -12336,25 +12458,25 @@ msgstr "Oggetto"
 msgid "Unset Status"
 msgstr "Deimposta stato"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Il nome della regola '%s' non è unico, scegline un altro."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regole"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Aggiungi regola"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Modifica regola"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Nome della regola"
 
@@ -12394,15 +12516,15 @@ msgstr "L'oggetto contiene"
 msgid "Subject does not contain"
 msgstr "L'oggetto non contiene"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "È necessario assegnare un nome a questa cartella virtuale."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "È necessario specificare almeno una cartella come sorgente."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Sorgente delle cartelle virtuali"
 
@@ -12455,9 +12577,9 @@ msgstr "Visualizzatore delle le cartelle di posta di Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Controllo delle preferenze della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Posta"
 
@@ -12465,7 +12587,7 @@ msgstr "Posta"
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Preferenze di posta"
 
@@ -12503,15 +12625,15 @@ msgstr "Specificare un nome script valido."
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Lingue"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Aggiungi firma script"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Firme"
 
@@ -12596,7 +12718,6 @@ msgid "Unread messages"
 msgstr "Messaggi non letti"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<fare clic qui per selezionare una cartella>"
 
@@ -12604,292 +12725,310 @@ msgstr "<fare clic qui per selezionare una cartella>"
 msgid "Create New Folder"
 msgstr "Crea nuova cartella"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome della cartella:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Su questo computer"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "NONRISCONTRATO"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Posta in arrivo"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Sto caricando..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Impossibile rinominare la cartella %s: operazione non valida"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Crea cartella"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Impossibile cancellare la cartella: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Cancellare la cartella \"%s\" e tutte le sottocartelle?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Elimina \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Impossibile rinominare la cartella %s: cartella inesistente"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Rinomina cartella"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Una cartella di nome \"%s\" esiste già. Usare un altro nome."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Apri in una nuova _finestra"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Sposta"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nuova cartella..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Modifica come nuovo messaggio..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Rispondi alla _lista"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Rispondi a _tutti"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Segue..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Flag completata"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Flag annullata"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Segna come _letto"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Segna come non letto"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Segna come _importante"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Segna come non i_mportante"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Segna come _da cancellare"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Segna come _non da cancellare"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi mittente alla ru_brica"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Applica _filtri"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Cartella virtuale sull'_oggetto"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _mittente"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _destinatari"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla mailing _list"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "Cartella virtuale sull'argomento"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_oggetto"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _mittente"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _destinatari"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _mailing list"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtro sull'argomento"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Predefinito"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Stampa messaggio"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo del collegamento"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Fare clic per spedire %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Corrisponde: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Non firmato"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Questo messaggio non è firmato. Non c'è garanzia che il mittente sia "
 "autentico."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Firma valida"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 "Questo messaggio è firmato ed è valido. Chi ha spedito il messaggio è molto "
 "probabilmente chi sostiene di essere."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Firma errata"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12897,11 +13036,11 @@ msgstr ""
 "La firma di questo messaggio non può essere verificata. Può essere stata "
 "alterata durante il transito."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma valida, non è possibile verificare il mittente"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12909,11 +13048,11 @@ msgstr ""
 "Il messaggio è firmato con una firma valida ma chi ha spedito il messaggio "
 "non può essere verificato."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Non decifrato"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12921,11 +13060,11 @@ msgstr ""
 "Il messaggio non è cifrato. Il suo contenuto può essere letto durante il "
 "tragitto attraverso Internet."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Cifrato, crittografia debole"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12935,11 +13074,11 @@ 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Cifrato"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12947,11 +13086,11 @@ msgstr ""
 "Questo messaggio è crittografato. È difficile che un estraneo possa leggere "
 "il contenuto del messaggio."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Cifrato, crittografia forte"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12961,36 +13100,36 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Visualizza certificato"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Scadute:"
 
 # per il %d %b %l:%M %p
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
@@ -13033,29 +13172,34 @@ msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 msgid "Formatting message"
 msgstr "Formattazione messaggio in corso"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Da"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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 "A"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Gestore di posta"
 
@@ -13069,8 +13213,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13087,20 +13231,25 @@ msgstr "Impossibile interpretare il messaggio S/MIME: errore sconosciuto"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Formato firma non supportato"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Errore sconosciuto durante la verifica della firma"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrato)"
 
@@ -13116,56 +13265,56 @@ msgstr ""
 "\n"
 "Attendere che Evolution finisca la migrazione delle cartelle..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Fallita la migrazione di cache uid pop3: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Fallita la migrazione dello stato di espansione della cartella: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Impossibile creare una cartella `%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Impossibile aprire un archivio per `%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "immagine_senzanome.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Imposta come _sfondo"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "Apri il c_ollegamento nel navigatore"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Invia un _messaggio a..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "_Aggiungi alla rubrica"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
@@ -13212,17 +13361,17 @@ msgstr "Filtri"
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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-utils.c:1146
+#: mail/em-utils.c:1149
 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:"
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13231,7 +13380,7 @@ msgstr ""
 "Impossibile salvare su: `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13240,29 +13389,35 @@ msgstr ""
 "`%s' esiste già.\n"
 "Sovrascriverlo?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "messaggio"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Errore: '%s' esiste e non è un file regolare."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Salva messaggio..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Aggiungi indirizzo"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mail da %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13275,7 +13430,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13301,82 +13456,96 @@ msgid "Check incoming mail being junk"
 msgstr "Controllo spazzatura sulla posta ricevuta"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Controllo spazzatura sulla posta ricevuta per account IMAP"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Colorazione della citazione della posta"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Colore della citazione della posta"
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Carattere predefinito da usare per comporre i messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Carattere predefinito da usare per comporre i messaggi."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Carattere predefinito da usare per mostrare i messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Carattere predefinito da usare per mostrare i messaggi."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Stile di inoltro predefinito"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Oggetto predefinito del messaggio."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Oggetto predefinito del messaggio."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Stile della risposta predefinito"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Larghezza predefinita del pannello cartelle"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Larghezza predefinita del pannello cartelle"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Mostra gli errori di battitura sulle parole mentre le si scrive."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Svuota i cestini all'uscita"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Svuota tutti i cestini all'uscita di Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Abilita la modalità cursore visibile, in maniera da visualizzare il cursore "
 "mentre si legge la posta."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Abilita/disabilità la modalità cursore visibile"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Altezza del pannello elenco messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Altezza del pannello elenco messaggi."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13387,15 +13556,15 @@ msgstr ""
 "visualizzato. È però necessario che possa essere associato al database di "
 "tipi mime nel componente visualizzatore bonobo di Gnome."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Elenco delle etichette e dei colori associati"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Elenco degli account"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13404,11 +13573,11 @@ msgstr ""
 "contiene delle stringhe che identificano le cartelle relative a /apps/"
 "evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr "Elenco delle intestazioni personalizzate e se sono abilitate."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13417,17 +13586,17 @@ msgstr ""
 "L'elenco contiene delle stringhe che contengono a loro volta delle coppie "
 "nome:colore dove il colore usa la notazione esadecimale dell'HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Elenco dei tipi mime da controllare per i componenti di visualizzazione di "
 "bonobo"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Carica le immagini dei messaggi HTML attraverso l'http"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13437,83 +13606,83 @@ msgstr ""
 "non scarica mai le immagini dalla rete 1 - scarica le immagini se chi le "
 "spedisce è presente nella rubrica 2 - scarica sempre le immagini dalla rete"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Azioni di filtraggio dei log"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Azioni di filtraggio sul file log specificato."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "File di log per controllare le azioni dei filtri"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "File di log per controllare le azioni dei filtri."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Segna come letto dopo un tempo specificato"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Segna come letto dopo un tempo specificato."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Segna le citazioni nell'anteprima del messaggio"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Segna le citazioni nell'anteprima del messaggio."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Stile di visualizzazione messaggio (normale, intestazioni complete, sorgente)"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Nuovo file sonoro di notifica nuova posta"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Nuovo tipo di notifica nuova posta"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Segnala se l'oggetto è vuoto"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Avverte l'utente quando si cerca di eliminare una cartella."
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Avverte l'utente quando si cerca di spedire un messaggio sprovvisto di "
 "oggetto."
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Avverte l'utente quando elimina qualcosa"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Avverte l'utente quando si compila solo il campo Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13521,101 +13690,93 @@ msgstr ""
 "Chiedi conferma prima di inviare messaggi HTML a contatti che non li "
 "desiderano."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Segnala l'invio di messaggi senza i campi A o Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Avverte l'utente quando si cerca di spedire HTML non desiderato"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Riconosce i collegamenti nel testo e li sostituisce."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Riconosce le faccine nel testo e le sostituisce con delle immagini."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Esegue dei controlli sullo spam sulla posta ricevuta"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Esegui il controllo spazzatura sulla posta in entrata negli account IMAP "
-"(valido solo se check_incoming è impostata a vera)"
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "OpZiOnE SeGrEtA"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "OpZiOnE SeGrEtA"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Invio posta predefinito in HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Invio posta predefinito in HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Mostra animazioni"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Mostra le immagini animate come animazioni."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Mostra messaggi cancellati (con una riga sopra) nell'elenco dei messaggi."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Mostra i messaggi cancellati nell'elenco messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Mostra nel pannello \"Anteprima\""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Mostra nel pannello \"Anteprima\"."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Avvisa con un segnale acustico quando arriva nuova posta."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Specifica il tipo di notifica posta in arrivo che l'utente intende usare."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Controllo ortografico automatico"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Carattere del terminale"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Il carattere da terminale per la visualizzazione della posta"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Il carattere a larghezza variabile per la visualizzazione dei messaggi"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13627,99 +13788,99 @@ msgstr ""
 "visualizzate. Il formato della struttura è &lt;intestazione abilitata&gt; - "
 "impostata se l'intestazione deve essere mostrata con la posta."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Elenca per discussioni."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Elenca per discussioni"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Elenca per discussioni basate sul soggetto"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Tempo necessario per marcare un messaggio come letto"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Tempo necessario per marcare un messaggio come letto."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Stringa UID dell'account predefinito."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usa il demone ed il client Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Usa il client e il demone Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Usa caratteri personalizzati"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Usa caratteri personalizzati per mostrare la posta"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Usa solo test di spam locale."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa solo test di spam locale (senza DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Carattere a larghezza variabile"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "La voce di menu Mostra/Bcc è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "La voce di menu Mostra/Bcc è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "La voce di menu Mostra/Cc è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "La voce di menu Mostra/Cc è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "La voce di menu Mostra/Da è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "La voce di menu Mostra/Da è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "La voce di menu Mostra/Posta a è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "La voce di menu Mostra/Posta a è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "La voce di menu Mostra/Rispondi a è selezionata"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "La voce di menu Mostra/Rispondi a è selezionata."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13727,69 +13888,66 @@ msgstr ""
 "Reimposta l'elenco per discussione in base al soggetto se i messaggi non "
 "contengono le intestazioni In-Risposta-A o Riferimenti."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "porta per l'esecuzione utente di spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "porta di spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Importatore Elm di Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importatore mbox di Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Importatore della posta di Netscape di Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Importatore Outlook Express 4 di Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Importatore Pine di Evolution."
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importatore mbox di 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando posta da Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importazione in corso..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Attendere"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importazione di %s come %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Scansione di \"%s\""
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importazione file"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13797,16 +13955,44 @@ msgstr ""
 "Evoluion ha trovato file di posta Elm\n"
 "Si desidera importarli in Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Cartella delle bozze:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Seleziona un certificato da importare..."
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importazione"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importazione file"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Scansione di \"%s\""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro Priorità \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13833,7 +14019,7 @@ msgstr ""
 "Controllare i filtri di importazione in modo che funzionino come \n"
 "previsto."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13844,7 +14030,7 @@ msgstr ""
 " \"Ignora il Thread\" o \"Controlla il Thread\", non supportata da\n"
 "Evolution. Questi filtri saranno tralasciati."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13858,31 +14044,24 @@ msgstr ""
 "modificati per controllare se una stringa è o non è contenuta\n"
 "nel corpo del messaggio."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Scansione filtri di posta"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Scansione cartella"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Inizio importazione"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Filtri di posta"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13890,11 +14069,20 @@ msgstr ""
 "Evolution ha trovato file di posta Netscape.\n"
 "Si desidera importarli in Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution sta importando i vecchi dati di Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importazione file"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Rubrica"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13902,7 +14090,7 @@ msgstr ""
 "Evolution ha trovato file di posta Pine.\n"
 "Si desidera importarli in Evolution"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13945,19 +14133,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Non sono state fornite tutte le informazioni richieste."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor degli account di Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Nome utente:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Percorso:"
 
@@ -14009,27 +14197,42 @@ msgstr ""
 "    '%s'\n"
 "e quindi sono state aggiornate."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nuovo messaggio di posta"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Invia _messaggio"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio di posta"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nuova cartella virtuale"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtri di posta"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Crea un nuovo calendario"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI della sorgente posta che la vista mostrerà"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identità"
 
@@ -14073,7 +14276,7 @@ msgstr ""
 "non si è sicuri, chiedere all'amministratore di sistema o al provider "
 "Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Gestione degli account"
 
@@ -14100,118 +14303,114 @@ msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Controlla tipi supportati"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non è supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non è supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>Intestazioni _della posta visualizzate</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Cifra anche con _la mia chiave inviando posta cifrata"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Editor account"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informazioni sull'account"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Aggiungi script"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Aggiungi nuova firma..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Cifra sempre con la mia chiave durante l'invio di posta crittografata"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sempre copia carbone _nascosta (Bcc) a:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sempre _copia carbone (Cc) a:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sempre chiavi di fiducia nel mio mazzo di chiavi quando crittografo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Allega messaggio originale"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Set di caratteri:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "C_olori"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Controllo arr_ivo nuova posta"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Controlla l'ortografia durante la digitazione"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Controllo nuova posta"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Controlla se la posta in arrivo è da cestinare"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Colore per errori di ortografia:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Composizione messaggio"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14227,277 +14426,273 @@ msgstr ""
 "\n"
 "Fare clic su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Comportamento predefinito"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Codice dei caratteri predefinito:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Cancellazione posta"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Firma _sempre i messaggi in uscita (predefinito)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "_Non controllare la nuova posta in ingresso per account IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Non citare il messaggio originale"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Non firmare le richieste di riunione (per compatibilità con Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Cartella delle bozze:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Cartelle Email"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficato di crittazione:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Guida agli account di Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Larghezza fissa:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Opzioni filtri"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Proprietà caratteri"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formato messaggi in _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Int_estazioni"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etichette e colori"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Caricamento immagini"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configurazione della posta"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Collocazione della casella di posta"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Compositore messaggio"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Visualizzazione messaggio"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Carattere del messaggio"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notifica nuova posta"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Nota: non verrà richiesta una password fino alla prima connessione"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informazioni opzionali"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganizzazione:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Caratteri di stampa"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Cita messaggio originale"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Ri_corda questa password"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Rispondi-a:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Opzioni di ricezione"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Ricorda questa _password"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informazioni richieste"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Ripristina predefiniti"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Sicur_ezza"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sicuro (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Seleziona font a larghezza fissa HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleziona carattere HTML a larghezza fissa per la stampa"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Seleziona carattere HTML a larghezza variabile"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Seleziona carattere HTML a larghezza variabile per la stampa"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Messaggi inviati e bozze"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configurazione del server"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tipo di server:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Certificato di fir_ma:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Specifica nome del _file:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Controllo ortografico"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14507,7 +14702,7 @@ msgstr ""
 "firma. Il nome specificato avrà solo scopo \n"
 "visivo."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14517,7 +14712,7 @@ msgstr ""
 "ortografico e la lingua. L'elenco delle lingue riflette solamente le lingue "
 "di cui si ha il dizionario installato."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14525,15 +14720,15 @@ msgstr ""
 "Indicare il nome con il quale ci si vuole riferire a questo account.\n"
 "Per esempio: \"Lavoro\" o \"Personale\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Usa il _demone"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Larghezza variabile:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14543,173 +14738,173 @@ msgstr ""
 "\n"
 "Fare clic su \"avanti\" per cominciare."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Aggiungi firma"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Carica sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firma _sempre i messaggi in uscita quando viene usato questo account"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo di _autenticazione: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo di _autenticazione: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Controlla la posta _automaticamente ogni"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Inserisci _automaticamente immagini delle faccine"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Emetti un suono quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Firma pre_definita:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Pre_definiti"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo _di nuova posta"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "Abilita"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Crittografa messaggi in uscita (predefinito)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Stile inoltro:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Posta _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identità"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "Da _cestinare"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "Carica _le immagini se il mittente è nella rubrica"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Solo per _test locali"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Imposta co_me account predefinito"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Avvisa con un segnale acustico quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Chiedi conferma _prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi senza oggetto"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Ricezione posta"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Stile _risposta:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Ripristina predefiniti"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Seleziona..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Spedizione posta"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Mostra immagini animate"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "Firme"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Carattere _standard:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Carattere del _terminale:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Usa connessione sicura (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Usa gli stessi caratteri delle altre applicazioni"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping a %s"
@@ -14732,7 +14927,7 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "In elaborazione"
 
@@ -14744,12 +14939,12 @@ msgstr "Filtraggio cartella"
 msgid "Fetching Mail"
 msgstr "Ricezione posta"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fallita l'applicazione dei filtri in uscita: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14758,116 +14953,116 @@ msgstr ""
 "Fallita l'aggiunta a %s: %s\n"
 "Aggiungo invece in locale alla cartella 'Sent'."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Impossibile aggiungere nella cartella locale 'Sent': %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio del messaggio %d di %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Salvataggio del messaggio nella cartella"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Lettura store %s in corso"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Aggiornamento cartella"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Svuotamento cestino in '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Ricezione di %d messaggio(i)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvataggiodi %d messaggio(i)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14876,7 +15071,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14885,11 +15080,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14898,22 +15093,22 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Cambio stato da cestinare"
 
@@ -14945,38 +15140,38 @@ msgstr "Cifratura"
 msgid "Security Information"
 msgstr "Informazioni di sicurezza"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tipo: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Percorso %s, tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Invia e ricevi posta"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Annulla tutto"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "In attesa..."
 
@@ -15085,20 +15280,20 @@ msgstr ""
 "    '%s'\n"
 "che ora è stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Modifica cartella virtuale"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Si è cercato di modificare una cartella virtuale (%s) che non esiste."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nuova cartella virtuale"
 
@@ -15420,97 +15615,20 @@ msgstr "Cartelle non in linea"
 msgid "Autocompletion Folders"
 msgstr "Cartelle di autocompletamento"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Impossibile copiare la cartella: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Impossibile spostare la cartella: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Impossibile spostare la cartella su se stessa."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Impossibile copiare una cartella su se stessa."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Impossibile spostare una cartella in una delle sue sottostanti."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Specifica una cartella in cui copiare la cartella \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Copia cartella"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Specifica una cartella in cui spostare la cartella \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Sposta cartella"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Impossibile cancellare la cartella:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Cancellare la cartella \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Impossibile rinominare la cartella:\n"
+"Impossibile creare la cartella specificata:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Il nome della cartella specificato non è valido: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "La cartella selezionata non appartiene ad un altro utente"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Impossibile rimuovere la cartella:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Impossibile creare la cartella specificata:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Senza nome)"
@@ -15650,7 +15768,7 @@ msgstr "Esecuzione di gpg non riuscita."
 msgid "_Import"
 msgstr "_Importa"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Chiusura connessione..."
 
@@ -15688,6 +15806,10 @@ msgstr "Impossibile aprire la cartella condivisa: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Impossibile trovare la cartella condivisa specificata."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Inizio importazione"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15805,125 +15927,6 @@ msgstr "Database di configurazione non trovato"
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Crea un nuovo gruppo di collegamenti"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nome del gruppo:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Si desidera veramente rimuovere il gruppo \"%s\" dalla barra dei "
-"collegamenti?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Rinomina gruppo di collegamenti"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Rinomina gruppo di collegamenti selezionato come:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Icone _piccole"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Mostra i collegamenti come icone piccole "
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Icone _grandi"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Mostra i collegamenti come icone grandi"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Nuovo gruppo..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Crea un nuovo gruppo di collegamento"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Rimuovi questo gruppo..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Rimuovi questo gruppo di collegamento"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Rinomina questo gruppo..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Rinomina questo gruppo di collegamento"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Nascondi la barra dei collegamenti"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Nascondi la barra dei collegamenti"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Crea collegamto pre_definito"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Crea collegamenti predefiniti"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Rinomina collegamento"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Rinomina collegamento selezionato come:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Aprire la cartella relativa a questo collegamento"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Apri in una nuova _finestra"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Apri la cartella relativa a questo collegamento in una nuova finestra"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Rinomina questo collegamento"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Ri_muovi"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Errore di salvataggio dei collegamenti"
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Collegamenti"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Crocette"
@@ -15934,11 +15937,6 @@ msgstr "Crocette"
 msgid "New"
 msgstr "Nuovo"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" in \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16237,45 +16235,45 @@ msgstr ""
 "%s: --online e --offline non possono essere usati insieme.\n"
 "  Usa %s --help per ulteriori informazioni.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Seleziona un certificato da importare..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Nome certificato:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Scopi"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Numero di serie"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Scadenza"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Indirizzo Email"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizzatore certificato: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Inserire la password per `%s'"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16284,7 +16282,7 @@ msgstr ""
 "Spedito a:\n"
 "  Soggetto: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16350,7 +16348,7 @@ msgstr ""
 "esaminiate attentamente le sue politiche e procedure di sicurezza (se "
 "accessibili)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Certificato"
 
@@ -16415,11 +16413,11 @@ msgstr "Unità organizzativa (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Impronta digitale SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "Certificato del client SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "Certificato del server SSL"
 
@@ -16466,209 +16464,209 @@ msgstr "Avete certificati su file che identificano queste persone:"
 msgid "Your Certificates"
 msgstr "I Vostri certificati"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Il certificato esiste già"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Versione"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Versione 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Versione 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Versione 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con crittografia RSA"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con crittografia RSA"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con crittografia RSA"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 crittografiea RSA"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Uso della chiave del certificato"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Tipo certificato Netscape"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificatore dell'autorità di certificazione chiavi"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificatore oggetto (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Identificatore algoritmo"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Parametri dell'algoritmo"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Informazioni chiave pubblica oggetto"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo chiave pubblica oggetto"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Chiave pubblica del destinatario"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Errore: impossibile elaborare l'estensione"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Firmatario oggetto"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "Autorità di Certificazione SSL"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Autorità di Certificazione Email"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "In firma"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "Non-ripudazione"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Cifratura chiave"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Cifratura dati"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Riconoscimento chiave"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Firmatario certificato"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "Firmatario CRL"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Critico"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Non critico"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Estensione"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo di firma del certificato"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Emissario"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "ID univoco emissario"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "ID univoco destinatario"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Valore firma certificato"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "File delle password PKCS12"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Inserire la password per il file PKCS12:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Certificati importati"
 
@@ -17258,7 +17256,8 @@ msgid "_Threaded Message List"
 msgstr "Elenca per _discussioni"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Aggiungi mittente alla _rubrica"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17266,7 +17265,8 @@ msgid "A_pply Filters"
 msgstr "A_pplica filtri"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Aggiungi mittente alla rubrica"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17713,10 +17713,6 @@ msgstr "For_mato"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Apri"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Apri un file"
@@ -18079,22 +18075,6 @@ msgstr "_Invia / ricevi"
 msgid "_Window"
 msgstr "_Finestra"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Stampa sommario"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Stampa sommario"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Aggiorna"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Aggiorna questa vista"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Per società"
@@ -18155,8 +18135,8 @@ msgstr "Con _categoria"
 msgid "_Tasks"
 msgstr "_Attività"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18400,23 +18380,23 @@ msgstr "_Cerca"
 msgid "_Find Now"
 msgstr "Trova ora"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Voce ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Sottovoce ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Testo"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "_Trova ora"
 
@@ -18430,6 +18410,223 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Sorgenti della rubrica"
+
+#~ msgid "No data provided"
+#~ msgstr "Nessun dato fornito"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile il file %s:\n"
+#~ "%s "
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile creare la directory `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile creare il file `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' non è una directory."
+
+#~ msgid "On this Computer"
+#~ msgstr "Su questo computer"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Controllo spazzatura sulla posta ricevuta per account IMAP"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Esegui il controllo spazzatura sulla posta in entrata negli account IMAP "
+#~ "(valido solo se check_incoming è impostata a vera)"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importazione di %s come %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Scansione filtri di posta"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Scansione cartella"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "_Non controllare la nuova posta in ingresso per account IMAP"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Impossibile copiare la cartella: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Impossibile spostare la cartella: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Impossibile spostare la cartella su se stessa."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Impossibile copiare una cartella su se stessa."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Impossibile spostare una cartella in una delle sue sottostanti."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Specifica una cartella in cui copiare la cartella \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Copia cartella"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Specifica una cartella in cui spostare la cartella \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Sposta cartella"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile cancellare la cartella:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Cancellare la cartella \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile rinominare la cartella:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "La cartella selezionata non appartiene ad un altro utente"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile rimuovere la cartella:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Crea un nuovo gruppo di collegamenti"
+
+#~ msgid "Group name:"
+#~ msgstr "Nome del gruppo:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Si desidera veramente rimuovere il gruppo \"%s\" dalla barra dei "
+#~ "collegamenti?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Rinomina gruppo di collegamenti"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Rinomina gruppo di collegamenti selezionato come:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Icone _piccole"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Mostra i collegamenti come icone piccole "
+
+#~ msgid "_Large Icons"
+#~ msgstr "Icone _grandi"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Mostra i collegamenti come icone grandi"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Nuovo gruppo..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Crea un nuovo gruppo di collegamento"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Rimuovi questo gruppo..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Rimuovi questo gruppo di collegamento"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Rinomina questo gruppo..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Rinomina questo gruppo di collegamento"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Nascondi la barra dei collegamenti"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Nascondi la barra dei collegamenti"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Crea collegamto pre_definito"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Crea collegamenti predefiniti"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Rinomina collegamento"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Rinomina collegamento selezionato come:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Aprire la cartella relativa a questo collegamento"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Apri in una nuova _finestra"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr ""
+#~ "Apri la cartella relativa a questo collegamento in una nuova finestra"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Rinomina questo collegamento"
+
+#~ msgid "Re_move"
+#~ msgstr "Ri_muovi"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Errore di salvataggio dei collegamenti"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Collegamenti"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" in \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Stampa sommario"
+
+#~ msgid "Print summary"
+#~ msgstr "Stampa sommario"
+
+#~ msgid "Reload"
+#~ msgstr "Aggiorna"
+
+#~ msgid "Reload the view"
+#~ msgstr "Aggiorna questa vista"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Copia nella cartella..."
 
diff --git a/po/ja.po b/po/ja.po
index c166e5b329..69247f6baf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-11 16:21+0900\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-11 16:19+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -47,10 +47,9 @@ msgstr "ここで自動補完を設定します"
 #. 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:362 mail/importers/netscape-importer.c:1844
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "連絡先"
 
@@ -90,19 +89,20 @@ msgstr "Evolution フォルダ設定コントロール"
 msgid "Manager your S/Mime certificates here"
 msgstr "この S/MIME 証明書のマネージャ"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "アドレス帳 '%s' を削除します。続行してもよろしいですか？"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -110,65 +110,65 @@ msgstr "新しいアドレス帳"
 msgid "Delete"
 msgstr "削除"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "新しい連絡先"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "新しい連絡先一覧"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "新しい連絡先一覧を作成します"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP サーバへ接続できませんでした"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP サーバを使った認証に失敗しました"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "ルート DSE に問い合わせできませんでした"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "サーバがサポートしていない検索ベースを返しました"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "このサーバは LDAPv3 スキーマ情報をサポートしていません"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "スキーマ情報の取得でエラーが発生しました"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "サーバは正しいスキーマ情報で応答しません"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "移行中..."
 
@@ -185,40 +185,41 @@ msgstr ""
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "このコンピュータ"
 
 #. Create the default Person addressbook
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "プライベート"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "LDAP サーバ"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP サーバ"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "自動補完の設定"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -230,7 +231,7 @@ msgstr ""
 "更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
 "ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -242,19 +243,19 @@ msgstr ""
 "更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
 "ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。"
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。"
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "この問い合わせは完全に終了しませんでした。"
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -262,7 +263,7 @@ msgstr ""
 "このアドレス帳を開けませんでした。パスの存在とアクセス権をチェックして下さ"
 "い。"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -270,7 +271,7 @@ msgstr ""
 "このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
 "サーバがダウンしていることをを意味します。"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -280,7 +281,7 @@ msgstr ""
 "Evolution で LDAP を利用するには、下記のリンクから OpenLDAP を取得した後、"
 "CVS 版のソースを再ビルド・インストールする必要があります。"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -288,27 +289,32 @@ msgstr ""
 "このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
 "がダウンしていることを意味します。"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "アドレス帳を開けません"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名で LDAP サーバにアクセスします"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "認証に失敗しました。\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "表示する連絡先ソースの UID が表示されます"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "カレンダが表示する URI"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "URI の補完に使用する EFolderList (XML 形式) の一覧"
@@ -352,7 +358,7 @@ msgstr " サポートしている検索ベースの表示(_H) "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -384,19 +390,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "アドレス帳の作成アシスタント"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "アドレス帳のソース"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "アドレス帳のソース..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "常に"
 
@@ -405,8 +414,10 @@ msgid "Anonymously"
 msgstr "匿名"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -414,51 +425,51 @@ msgstr ""
 "\n"
 "\"適用\" ボタンをクリックして、ここで入力した設定を保存して下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "接続"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "識別名(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-メール・アドレス:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution はこの DN (識別名) を使ってサーバの認証を行います"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution はこの E-メール・アドレスを使ってサーバを利用した認証を行います"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "完了しました"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "全般"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "グループ:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "しない"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -474,23 +485,23 @@ msgstr ""
 "LDAP サーバが使用しているプロトコルについては、システム管理者に連絡して下さ"
 "い。"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "レベル１"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "検索範囲(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "検索"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "選択済:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -500,7 +511,7 @@ msgstr ""
 "る場合にのみ、\n"
 "Evolution は LDAP サーバに接続します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -516,7 +527,7 @@ msgstr ""
 "ファイヤーウォールの内側にある場合、Evolution は SSL/TLS を使いません。\n"
 "その理由は、既にセキュリティ保護された接続環境にあるからです。"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -530,7 +541,7 @@ msgstr ""
 "ティの恩恵を\n"
 "受けることができなくなることを意味します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -540,39 +551,41 @@ msgstr ""
 "このオプションを有効にすると、Evolution の LDAP 検索や\n"
 "連絡先の生成や編集の初期値を変更できます。"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "アドレス帳の設定の最初のステップとして、表示名とグループを指定して下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "ステップ１: フォルダの種類"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "ステップ２: サーバの情報"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "ステップ３: サーバへの接続"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "ステップ４: ディレクトリの検索"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "サブ・ディレクトリ"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "サポートする検索ベース"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -585,7 +598,7 @@ msgstr ""
 "また検索時間をどれくらいにするかを設定します。\n"
 "これらのオプションを変更する必要がある場合は、システム管理者にお尋ね下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -595,7 +608,7 @@ msgstr ""
 "検索ベースとは、検索を開始するエントリの識別名 (DN) です。\n"
 "空白のままにすると、ディレクトリ・ツリーのルートから検索を開始します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -610,11 +623,13 @@ msgstr ""
 "す。\n"
 "検索範囲 \"レベル１\" には検索ベースの第一レベルのエントリのみ含まれます。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -624,23 +639,24 @@ msgstr ""
 "追加すべき情報が必要になるかもしれません。\n"
 "それらの情報が不明な場合は、システム管理者に連絡して下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "これはダウンロードするエントリの最大数です。\n"
 "この数を大きくすると、アドレス帳を開くのが遅くなります。"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -649,7 +665,7 @@ msgstr ""
 "これは Evolution があなたを識別する方法です。\"E-メール・アドレス\" に対する"
 "この設定には、LDAP サーバに対する匿名アクセスが必要となります。"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -658,7 +674,7 @@ msgstr ""
 "これはこのサーバの名前で、Evolution フォルダ一覧の中に表示されます。\n"
 "表示目的にのみ使用されます。"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -666,7 +682,7 @@ msgid ""
 msgstr ""
 "これは Evolution フォルダの中に表示される名前で、表示目的にのみ使用されます。"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -677,28 +693,28 @@ msgstr ""
 "標準ポートの一覧が提供されています。\n"
 "特別に指定する必要がある場合は、システム管理者にお尋ね下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "このオプションは検索にかかる処理時間を指定します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS を使用する(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "使用する識別名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -709,19 +725,19 @@ msgstr ""
 "アカウント名とログイン情報を提供して下さい。\n"
 "これらの情報が不明な場合は、システム管理者に問い合わせて下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "表示名(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -730,39 +746,39 @@ msgstr "ダウンロード制限(_D):"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "ログイン方式(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "ポート番号(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "検索ベース(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "サーバ名(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "タイムアウト(分)(_T):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "カード"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "接続タブ"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "全般タブ"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "検索タブ"
 
@@ -877,7 +893,7 @@ msgstr "コラボレーション"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
@@ -970,10 +986,10 @@ msgstr "カテゴリ(_C)..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1021,15 +1037,15 @@ msgid "_Web page address:"
 msgstr "ウェブ・ページの URL(_W):"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "住所"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2013,102 +2029,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL インスタント・メッセンジャ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo メッセンジャ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN メッセンジャ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "サービス"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "場所"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "ユーザ名"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "自宅"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "仕事"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "元のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "対象のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "連絡先"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "新しい連絡先です"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "書き込み可能な項目"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "変更済"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "アカウント名"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "カテゴリ・エディタが起動していません。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先が属しているカテゴリ:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "vCard 形式で連絡先の保存"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2116,7 +2141,7 @@ msgstr ""
 "この連絡先を\n"
 "本当に削除してもよろしいですか？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2124,46 +2149,51 @@ msgstr ""
 "この連絡先を\n"
 "本当に削除してもよろしいですか？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "仕事"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "フィールドのウィジットが見つかりませんでした: '%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "連絡先の簡易追加"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "全て編集(_E)"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "氏名(_F):"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-メール(_M):"
 
@@ -2320,11 +2350,11 @@ msgid "Is New List"
 msgstr "新しい一覧です"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "連絡先一覧エディタ"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "一覧を vCard で保存"
 
@@ -2413,13 +2443,13 @@ msgid "Email begins with"
 msgstr "E-メールが次のもので始まる"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "カテゴリが次のものを含む"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "項目が次のものを含む"
 
@@ -2436,98 +2466,97 @@ msgid "Type"
 msgstr "種類"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "アドレス帳"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "vCard 形式で保存"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "新しい連絡先..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "新しい連絡先一覧..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "フォルダへ移動..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "インポート..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "連絡先の検索..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Address Book Sources..."
 msgstr "アドレス帳のソース..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "パイロットの設定..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "この連絡先の転送"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "この連絡先へメッセージの送信"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "宛名の印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Copy to Address Book..."
 msgstr "アドレス帳へコピー..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 msgid "Move to Address Book..."
 msgstr "アドレス帳へ移動..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "切り取り"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "コピー"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "貼り付け"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "現在の表示"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2539,8 +2568,8 @@ msgstr ""
 "再度利用する場合は Evolution を再起動して下さい。"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "任意のカテゴリ"
 
@@ -2583,7 +2612,7 @@ msgid "Company Phone"
 msgstr "会社の電話"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "メール"
 
@@ -2642,7 +2671,7 @@ msgid "Nickname"
 msgstr "あだ名"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "ノート"
 
@@ -2651,7 +2680,7 @@ msgid "Office"
 msgstr "事務所"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "組織"
 
@@ -2777,61 +2806,67 @@ msgstr "選択済"
 msgid "Has Cursor"
 msgstr "カーソルあり"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr "(マップ)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr "マップ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "メンバーのリスト化"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-メール"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr "仕事"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr "役職"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "グループ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr "ビデオ会議"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr "電話"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr "FAX"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr "プライベート"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr "ウェブ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "職業"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "ホームページ"
 
@@ -2840,8 +2875,8 @@ msgid "Success"
 msgstr "成功"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2871,7 +2906,7 @@ msgstr "プロトコルがサポートされていません"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2891,7 +2926,8 @@ msgid "TLS not Available"
 msgstr "TLS は無効です"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "アドレス帳がありません"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3025,7 +3061,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "既存の連絡先 \"%s\" へのアドレスの追加"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "アドレス帳の問い合わせ中..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3066,31 +3103,54 @@ msgstr "カード表示"
 msgid "GTK Tree View"
 msgstr "GTK+ ツリー表示"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow のテスト"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "キャンバスのアイテムを Reflow するどうかをテストします"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm インポータ"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar インポータ"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar インポータ"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "複数の連絡先の印刷"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "連絡先の印刷"
 
@@ -3182,7 +3242,7 @@ msgstr "マージン"
 msgid "Number of columns:"
 msgstr "列数:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "オプション"
 
@@ -3360,8 +3420,8 @@ msgstr "ファイル名が指定されていません。"
 msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "パスワードの入力"
 
@@ -3438,10 +3498,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution タスクのコンポーネント"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
-#: mail/importers/netscape-importer.c:1845
 msgid "Tasks"
 msgstr "タスク"
 
@@ -3485,26 +3544,26 @@ msgstr "アラーム停止時間 (分)"
 msgid "_Edit appointment"
 msgstr "予定の編集(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "開く(_O)"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "開く"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "却下(_D)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "全て却下(_A)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "無効な説明です。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3517,12 +3576,12 @@ msgstr ""
 "起動: %s\n"
 "終了: %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3534,7 +3593,7 @@ msgstr ""
 "の設定がされていました。その代わりに Evolution は\n"
 "通常のリマインダ・ダイアログを表示します。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3551,19 +3610,19 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo を初期化できませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs を初期化できませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "アラーム通知サービスファクトリを作成できませんでした"
 
@@ -3699,24 +3758,30 @@ msgstr "時刻を午前/午後の代わりに 24時間制で表示するかど�
 msgid "Whether to show week numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示するかどうか"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "サマリが次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "説明が次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "コメントが次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "説明が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "一致しない"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "カレンダ"
 
@@ -3744,12 +3809,8 @@ msgstr "%Y年 %B %e日 %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
@@ -3771,70 +3832,70 @@ msgstr "%Y年 %B %e日"
 msgid "%d %B"
 msgstr "%B%e日"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "カレンダ '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "終日の予定(_D)"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "カレンダ(_A)"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "イベントと会議を生成するためのカレンダ '%s' を開けません"
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議を生成するために利用可能なカレンダがありません"
 
@@ -3966,7 +4027,7 @@ msgstr "時間"
 msgid "minutes"
 msgstr "分"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "アクション/トリガ"
 
@@ -4038,7 +4099,7 @@ msgid "hour(s)"
 msgstr "時間"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "分"
 
@@ -4049,7 +4110,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "有効"
 
@@ -4099,7 +4160,7 @@ msgstr "30 分"
 msgid "60 minutes"
 msgstr "60 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "警告"
 
@@ -4124,7 +4185,7 @@ msgid "Days"
 msgstr "日"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "有効(_N)"
 
@@ -4264,7 +4325,7 @@ msgid "_Fri"
 msgstr "金(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "全般(_G)"
 
@@ -4359,7 +4420,7 @@ msgstr ""
 "\"適用\" ボタンをクリックして、ここで入力した設定を保存して下さい。"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "新しいタスク一覧"
 
@@ -4518,23 +4579,23 @@ msgstr "%s  何も変更していませんが、エディタを更新します�
 msgid "Validation error: %s"
 msgstr "整合性のエラー: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " から "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr "(完了 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "完了しました"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (期日 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "期日 "
 
@@ -4570,8 +4631,8 @@ msgstr "ジャーナル・エントリ - %s"
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "別名で保存..."
 
@@ -4597,10 +4658,21 @@ msgstr "転送先ソースを開けませんでした"
 msgid "Destination is read only"
 msgstr "転送先は読み込み専用"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "転送先ソースの選択"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "カレンダ"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "新しいタスク一覧"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4703,7 +4775,7 @@ msgstr "委任先:"
 msgid "Enter Delegate"
 msgstr "委任先の入力"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "予定"
 
@@ -4727,23 +4799,32 @@ msgstr "スケジュール"
 msgid "Meeting"
 msgstr "会議"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "期日が開始日の前にあります！"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "終了日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "開始時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "終了時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "カレンダ '%s' を開けません。"
@@ -4817,36 +4898,31 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "なし"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "指定した主催者のアカウントがありません。"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "主催者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "最低一名の出席者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "委任先(_D)..."
 
@@ -5031,7 +5107,7 @@ msgstr "の"
 msgid "occurrences"
 msgstr "くりかえす"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "日付/時刻"
 
@@ -5064,7 +5140,7 @@ msgid "_No recurrence"
 msgstr "繰り返さない(_N)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "削除(_R)"
 
@@ -5106,7 +5182,7 @@ msgstr ""
 "\n"
 "その変更を保存しますか？"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "変更の破棄(_D)"
 
@@ -5130,7 +5206,7 @@ msgstr "タスク情報が生成されました。この情報を送信します
 msgid "The task information has changed. Send an updated version?"
 msgstr "タスク情報が変更されました。更新されたバージョンを送信しますか？"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
 
@@ -5143,7 +5219,7 @@ msgstr "% 完了(_C)"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "完了"
 
@@ -5156,7 +5232,7 @@ msgstr "高い"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "進行中"
 
@@ -5175,7 +5251,7 @@ msgstr "普通"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "開始していない"
 
@@ -5214,16 +5290,16 @@ msgstr "基本"
 msgid "Assignment"
 msgstr "割当て"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "期日が間違っています"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "期日が開始日の前にあります！"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' のタスクを開けません。"
@@ -5234,7 +5310,7 @@ msgstr "極秘(_F)"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "説明:"
 
@@ -5421,7 +5497,7 @@ msgstr "開始日"
 msgid "Summary"
 msgstr "サマリ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "色"
 
@@ -5446,7 +5522,7 @@ msgstr "北"
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "東"
 
@@ -5481,10 +5557,10 @@ msgstr "いいえ"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "未知"
@@ -5497,99 +5573,105 @@ msgstr "繰り返し"
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "指定したオブジェクトを削除します"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "オブジェクトの更新"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "新しい終日のイベント(_E)"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "新しい会議"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "新しいタスク"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "今日へ移動(_T)"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "指定日へ移動(_G)..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "予定の有無の公開(_P)"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "開く(_O)"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "iCalender 形式で転送(_F)..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "全てのイベントの削除(_A)"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "設定(_S)..."
 
@@ -5676,7 +5758,7 @@ msgid "Alarms"
 msgstr "アラーム"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "完了しました"
 
@@ -5705,20 +5787,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5742,33 +5816,26 @@ msgstr "%02i 分分割"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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.
-#. 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "午後"
@@ -5951,7 +6018,7 @@ msgid "Send Latest Information"
 msgstr "最新情報の送信"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "キャンセル"
@@ -6313,10 +6380,6 @@ msgstr "%Y年 %B %e日 %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-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
@@ -6325,10 +6388,6 @@ msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
@@ -6412,12 +6471,12 @@ msgstr "優先度:"
 msgid "Web Page:"
 msgstr "ウェブ・ページ"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6427,7 +6486,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6438,12 +6497,12 @@ msgstr ""
 "用のタスク・バックエンドが\n"
 "クラッシュしました。"
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s のタスクを開きます"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6452,28 +6511,38 @@ msgstr ""
 "%s を開く際にエラー:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "タスクの読み込み"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "タスクの完了..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "指定したオブジェクトの削除..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "抹消"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "タスクの読み込み"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "予定 - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "%s を開く"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6594,16 +6663,16 @@ msgstr "予定の有無 (%s から %s)"
 msgid "iCalendar information"
 msgstr "iCalendar 情報"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "イベントの出席しなければなりません。"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s のパスワードを入力して下さい"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6615,7 +6684,7 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6627,12 +6696,12 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "誕生日と記念日"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "ウェブ"
 
@@ -6821,49 +6890,49 @@ msgstr "月の指定 (%Y年 %B)"
 msgid "Selected year (%Y)"
 msgstr "年の指定 (%Y年)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "タスク"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "優先度: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "達成率: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "カテゴリ: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "連絡先: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "アイテムの印刷"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
@@ -6872,36 +6941,36 @@ msgstr "プリンタの設定"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "タスク一覧 '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "新規のタスク"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "新しいタスク一覧"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "タスク一覧(_T)"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "新しいタスク一覧を作成します"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なタスク一覧 '%s' を開けません"
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
@@ -8641,7 +8710,7 @@ msgstr "メッセージを開けません"
 msgid "Failed on message %d"
 msgstr "メッセージ %d で失敗しました"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "フォルダの同期中"
 
@@ -8726,7 +8795,7 @@ msgstr "メッセージのコピー中"
 msgid "Filtering new message(s)"
 msgstr "新しいメッセージのフィルタリング中"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8737,15 +8806,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG のユーザ ID ヒントの解析に失敗しました。"
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG のパスワード要求の解析に失敗しました。"
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8754,30 +8823,26 @@ msgstr ""
 "次のユーザのキーを解除するパスワードが必要です:\n"
 " \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "秘密鍵の解除に失敗しました: 指定した三つのパスワードがおかしいです。"
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG から予期しない応答がありました: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "期日が指定されていません"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "暗号化に失敗しました: 正しい宛先が指定されていません。"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8788,34 +8853,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr " %s の GPG 化に失敗しました: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "署名データを生成できませんでした: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG の実行に失敗しました: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "GPG の実行に失敗しました"
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "このメッセージにはデジタル署名された部分があります"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
@@ -8823,27 +8888,27 @@ msgstr ""
 "このメッセージ署名の整合性を確認できません: メッセージの書式が正しくありませ"
 "ん"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "このメッセージの整合性を確認できません: 作業用ファイルを作成できませんでし"
 "た: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "暗号化したデータを生成できませんでした: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "これはデジタル署名された部分です"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "暗号化された内容"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "メッセージの内容を解析できません"
 
@@ -8954,23 +9019,36 @@ msgstr "MIME 型の暗号解読に失敗しました: おかしな構造"
 msgid "parse error"
 msgstr "解析エラー"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "仮想フォルダ・メール・プロバイダ"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "その他のフォルダ・セットのクエリとしてメールを読む"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s を読み込めませんでした: このシステムではモジュールの読み込みをサポートして"
 "いません。"
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s を読み込めませんでした: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s を読み込めませんでした: モジュールのコードが初期化されていません。"
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "プロトコル '%s' を利用できるプロバイダはありません"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "匿名"
@@ -9127,7 +9205,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました。"
 
@@ -9262,20 +9340,7 @@ msgstr "ホストの検索に失敗しました: ホストは見つかりませ�
 msgid "Host lookup failed: unknown reason"
 msgstr "ホストの検索に失敗しました: 原因は不明です"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "仮想フォルダ・メール・プロバイダ"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "その他のフォルダ・セットのクエリとしてメールを読む"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "プロトコル '%s' を利用できるプロバイダはありません"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9338,21 +9403,25 @@ msgstr "署名者: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "フォルダを取得できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "フォルダを作成できません: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "フォルダを作成できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Junk"
@@ -9584,21 +9653,31 @@ msgstr "%s に %s のようなメッセージはありません"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダへのコピーまたは移動ができません"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダ名を変更できません: %s: 不正な操作です"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "NNTP フォルダからメッセージのコピーはできません！"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "NNTP フォルダからメッセージのコピーはできません！"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9614,14 +9693,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "このサーバの Inbox にある新しいメッセージへフィルタを適用する"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "リモートとローカルのメールを自動的に同期する"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "アドレス帳"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "LDAP サーバ名:"
@@ -9639,44 +9714,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell Groupwise サーバ・アクセス用です"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "パスワード"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って IMAP サーバに接続しま"
 "す"
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "デフォルト"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "一覧"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "操作はキャンセルされました"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "突然サーバが接続を切りました: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9685,26 +9758,26 @@ msgstr ""
 "IMAP サーバ %s@%s からの警告:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない応答がありました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "サーバレスポンスはあっけなく終わりました"
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
@@ -9719,7 +9792,7 @@ msgstr "フォルダ %s を作成できませんでした: %s"
 msgid "Could not load summary for %s"
 msgstr "%s のサマリをロードできませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "フォルダは破壊され再作成されました"
 
@@ -9728,12 +9801,12 @@ msgstr "フォルダは破壊され再作成されました"
 msgid "Scanning for changed messages"
 msgstr "変更メッセージの解析中"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "メッセージを取得できません: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9749,25 +9822,25 @@ msgstr ""
 "メッセージを取得できません: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "現在このメッセージは有効ではありません"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "新規メッセージのサマリ情報の同期中"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体がありませんでした。"
 
@@ -9822,27 +9895,37 @@ msgstr "ネームスペース"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "全てのフォルダの新着メールをチェックします"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "全てのフォルダの新着メールをチェックします"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP サーバ %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s の %s にある IMAP サービス"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9851,65 +9934,65 @@ msgstr "%s の %s にある IMAP サービス"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続できませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 拡張がサポートされていません。"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 接続に失敗しました"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "コマンド \"%s\" で接続できませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9920,24 +10003,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "フォルダを作成できません: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知の親フォルダ: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "親フォルダには複数のサブフォルダを含めることはできません"
 
@@ -9963,7 +10054,7 @@ msgstr ""
 "\n"
 " *** これを業務メールで使用しないこと ***\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s の POP サーバへ接続できませんでした"
@@ -10046,8 +10137,8 @@ msgstr ""
 "(Elm, Pine, Mutt 形式のフォルダの読み込みにも対応)"
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10059,55 +10150,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "フォルダを取得できません: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "ローカルへの保存は inbox を持てません"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "ローカル・メールのファイル %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "フォルダを %s から %s へ名前変更できませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' の名前を変更できませんでした: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "フォルダのメタ・ファイル '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "サマリを保存できませんでした: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "メッセージをサマリへ追加できません: 理由は不明です"
 
@@ -10125,53 +10216,44 @@ msgstr "Maildir 形式のフォルダへメッセージを追加できません:
 msgid "Invalid message contents"
 msgstr "メッセージの内容は無効です"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"フォルダ '%s' を開けませんでした:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "フォルダを取得できません: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "フォルダ '%s' がありません。"
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"フォルダ '%s' を作成できませんでした:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "フォルダを作成できません: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "'%s' は maildir 形式のフォルダではありません"
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "フォルダ '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダではありません"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10193,9 +10275,9 @@ msgid "Checking for new messages"
 msgstr "新しいメッセージのチェック"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "フォルダに格納する"
@@ -10239,156 +10321,134 @@ msgstr "フォルダで回復不能なエラーが発生したようです"
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "メッセージの解釈に失敗しました: 間違ったメールボックスですか？"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"ファイル '%s' を開けませんでした:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "そのような名前でフォルダを作成できません。"
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"フォルダ '%s' を作成できませんでした:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "ファイル %s を添付できません: 通常のファイルではありません"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"ファイル '%s' を作成できませんでした:\n"
+"フォルダ '%s' を削除できませんでした:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "'%s' は通常のファイルではありません"
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"フォルダ '%s' を削除できませんでした:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "フォルダ '%s' は空ではありません。削除しません。"
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "そのような名前でフォルダを作成できません。"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "フォルダ '%s' を作成できません: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "フォルダを作成できません: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "既にフォルダがあります"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "新しいフォルダの名前は正しくありません。"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' の名前を変更できませんでした: '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' から %s へ名前を変更できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "フォルダを開けませんでした: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld 付近のフォルダ %s で致命的なメール構文解析エラーです"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "フォルダをチェックできません: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ファイルを開けませんでした: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "作業用の mailbox を開けませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダ %s を閉じることができませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることができませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダ名を変更できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "同期しましたが, サマリーとフォルダが不一致です"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知のエラー: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "フォルダを保存できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s: %s"
@@ -10402,10 +10462,17 @@ msgstr "MH 形式のメッセージ追加が取り消されました"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "MH 形式フォルダへメッセージを追加できません: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"フォルダ '%s' を作成できませんでした:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "'%s' はフォルダではありません"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "フォルダを取得できません: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10427,6 +10494,29 @@ msgstr "スプール '%s' は通常のファイル/フォルダではありま�
 msgid "Folder `%s/%s' does not exist."
 msgstr "フォルダ '%s/%s' がありません。"
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"フォルダ '%s' を開けませんでした:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "フォルダ '%s' がありません。"
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"フォルダ '%s' を作成できませんでした:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10668,46 +10758,46 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ニュース格納場所のフォルダを削除できません: 代わりに購読を停止して下さい。"
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "接続エラー: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "そのようなフォルダはありません: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "グループを取得できませんでした: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "メッセージを受信できませんでした: 想定していないエラーです"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP コマンドが失敗しました: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: 新しいメッセージの解析中"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "未知のサーバ応答: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "キャンセルを利用する"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作が失敗しました: %s"
@@ -10754,7 +10844,7 @@ msgstr "%s 日後に削除する"
 msgid "Disable support for all POP3 extensions"
 msgstr "全ての POP3 拡張サポートを無効にする"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10843,7 +10933,7 @@ msgid "No such folder `%s'."
 msgstr "そのようなフォルダ '%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10896,7 +10986,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11063,7 +11153,7 @@ msgstr "%s 経由で SMTP メールを配信します"
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません。"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "メッセージの送信中"
 
@@ -11169,34 +11259,34 @@ msgstr "QUIT 要求のタイムアウト: %s"
 msgid "QUIT response error"
 msgstr "QUIT 応答エラー"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "添付した内容の一覧から指定したアイテムを削除します"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "添付の追加..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
@@ -11312,14 +11402,14 @@ msgstr "<ここをクリックして投稿するフォルダを選択して下�
 msgid "Attach file(s)"
 msgstr "ファイルの添付"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "送信メッセージに署名できません: このアカウントからの送信に対応した署名付き証"
 "明書がありません。"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11327,7 +11417,7 @@ msgstr ""
 "送信するメッセージを暗号化できません: 利用アカウントに対する暗号化に必要な証"
 "明書セットがありません。"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11336,30 +11426,30 @@ msgstr ""
 "ファイル %s の読み込み中にエラー:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "ファイルがあります。上書きしてもよろしいですか？"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "ファイルへアクセス中にエラー: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "エディタからメッセージを取得できません"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11368,7 +11458,7 @@ msgstr ""
 "ファイル上で読み込み位置へ移動できません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11377,7 +11467,7 @@ msgstr ""
 "ファイルの切り詰めができません: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11386,7 +11476,7 @@ msgstr ""
 "ファイル・デスクリプタをコピーできません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11395,7 +11485,7 @@ msgstr ""
 "メッセージの自動保存でエラー: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11404,7 +11494,7 @@ msgstr ""
 "た。\n"
 "それらのメッセージを復旧してみますか？"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11415,44 +11505,44 @@ msgstr ""
 "\n"
 "この変更を保存しますか？"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "警告: 変更済みのメッセージ"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "署名:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, 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:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 "添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "メッセージの作成"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11460,7 +11550,7 @@ msgstr ""
 "コンポーザ・ウィンドウを生成できませんでした:\n"
 "アドレス選択コントロールを開けません。"
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11472,7 +11562,7 @@ msgstr ""
 "正しいバージョンの gtkhtml と libgtkhml が\n"
 "インストールされているか確認して下さい。\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11480,7 +11570,7 @@ msgstr ""
 "コンポーザ・ウィンドウを作成できませんでした:\n"
 "HTML エディタ・コンポーネントを開けません。"
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11635,16 +11725,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"
@@ -11696,31 +11782,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -11841,7 +11919,7 @@ msgstr "その結果"
 msgid "You must specify a folder."
 msgstr "フォルダを指定して下さい。"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "フォルダの選択"
@@ -11856,19 +11934,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "重要"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "ToDo"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "保留"
 
@@ -11956,7 +12034,7 @@ msgstr ""
 "メッセージの日付は、フィルタが実行された時の\n"
 "現在の時刻と比較されます。"
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "仮想フォルダ"
 
@@ -11972,7 +12050,7 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr " 秒"
 
@@ -12141,7 +12219,7 @@ msgstr "にフラグがない"
 msgid "Junk Test"
 msgstr "ジャンクのテスト"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ラベル"
@@ -12247,9 +12325,10 @@ msgstr "が次のもので始まる"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "件名"
 
@@ -12257,25 +12336,25 @@ msgstr "件名"
 msgid "Unset Status"
 msgstr "ステータスの解除"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "ルール名 '%s' がユニークではありません。別のものを選択して下さい"
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "ルール"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "ルールの追加"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "ルールの編集"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "ルール名"
 
@@ -12315,15 +12394,15 @@ msgstr "件名が次のものを含む"
 msgid "Subject does not contain"
 msgstr "件名が次のものを含まない"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "この仮想フォルダに名前を付けて下さい。"
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "ソースとして少なくとも一つフォルダを指定する必要があります。"
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "仮想フォルダのソース"
 
@@ -12372,9 +12451,9 @@ msgstr "Evolution メール・フォルダ・ビューア"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution メール設定コントロール"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "メール"
 
@@ -12382,7 +12461,7 @@ msgstr "メール"
 msgid "Mail Accounts"
 msgstr "メールのアカウント"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "メールの設定"
 
@@ -12420,15 +12499,15 @@ msgstr "正しいスクリプト名を指定して下さい。"
 msgid "[script]"
 msgstr "[スクリプト]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "言語"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "署名スクリプトの追加"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "署名"
 
@@ -12519,299 +12598,318 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定して下さい:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "フォルダ名(_N):"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "このコンピュータ"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "一致しないもの"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "受信箱"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "フォルダ名を変更できません: %s: 不正な操作です"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "フォルダを削除できませんでした: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "本当にフォルダ \"%s\" とそのサブフォルダの全てを削除しますか？"
 
-#: mail/em-folder-tree.c:1993
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" の削除"
 
-#: mail/em-folder-tree.c:2027
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2029
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2053
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "既にフォルダ名 \"%s\" があります。別の名前を使用して下さい。"
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "移動(_M)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2112
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "フォロー・アップ(_W)..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "フォルダへ移動(_V)..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "差出人をアドレス帳に追加"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "フィルタの適用(_Y)"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "仮想フォルダのスレッド表示"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "スレッド表示のフィルタ"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "デフォルト"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "メール %s をクリックして下さい"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "一致するもの: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "署名なし"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "このメッセージは署名されていません。このメッセージの差出人を証明できません。"
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "不正な署名"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "署名妥当ですが、差出人を検証できません"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12819,11 +12917,11 @@ msgstr ""
 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
 "きません。"
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12831,11 +12929,11 @@ msgstr ""
 "このメッセージは暗号化されていません。インターネットを介して閲覧される可能性"
 "があります。"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12845,11 +12943,11 @@ msgstr ""
 "です。(現実的には困難ですが)、このメッセージの内容を外部の者に閲覧される可能"
 "性があります。"
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12857,11 +12955,11 @@ msgstr ""
 "このメッセージは暗号化されています。外部の者がこのメッセージの内容を閲覧する"
 "ことは困難と思われます。"
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12870,35 +12968,35 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
 "このメッセージの内容を閲覧することは非常に困難と思われます。"
 
-#: mail/em-format-html-display.c:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M に完了"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M まで"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d ページ"
@@ -12941,29 +13039,34 @@ msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
 msgid "Formatting message"
 msgstr "メッセージの整形"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "差出人"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "メール・クライアント"
 
@@ -12977,8 +13080,8 @@ msgstr "<I> (%R %a %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "日付"
 
@@ -12995,19 +13098,24 @@ msgstr "S/MIME メッセージを解析できませんでした: 不明なエラ
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "サポートしていない S/MIME の暗号化の種類"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "サポートしていない署名の書式"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "署名を検証する際に不明なエラーが発生しました"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "署名を検証する際に不明なエラーが発生しました"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (内蔵)"
 
@@ -13023,56 +13131,56 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "POP3 UID キャッシュの移行に失敗しました: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "フォルダ展開ステータスの移行に失敗しました: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "フォルダ '%s' の作成に失敗しました: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "'%s' の格納場所を開けませんでした: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "壁紙にセットする(_B)"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く(_O)"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "メッセージの送信(_N)..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "アドレス帳に追加(_A)"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "%s で開く..."
@@ -13119,17 +13227,17 @@ msgstr "フィルタ"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 転送するメッセージ --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13138,7 +13246,7 @@ msgstr ""
 "'%s' へ保存できません。\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13147,29 +13255,35 @@ msgstr ""
 "既に '%s' があります。\n"
 "上書きしてもよろしいですか？"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "メッセージ"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "エラー: '%s' は存在していますが、通常のファイルではありません。"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "メッセージの保存..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "住所の追加"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "%s からメール"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "作業フォルダを作成できませんでした: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13182,7 +13296,7 @@ msgstr ""
 "\n"
 "本当にこれらのメッセージを削除しますか？"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13207,79 +13321,95 @@ msgid "Check incoming mail being junk"
 msgstr "受信メールがジャンクかどうかチェックする"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "IMAP アカウントの受信メールがジャンクかどうかチェックする"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "引用を強調表示する際の色"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "引用を強調表示する際の色です。"
 
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Composer Window default height"
+msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
+
 #: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Composer Window default width"
+msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "メッセージ作成時のデフォルトの文字セット"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "メッセージを作成する際に使用するデフォルトの文字セットです。"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "メッセージ表示時のデフォルトの文字セット"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "メッセージを表示する際に使用するデフォルトの文字セットです。"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "デフォルトの転送スタイル"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "デフォルトの返信スタイル"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "メッセージ・ウィンドウのデフォルトの幅です。"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "メッセージ・ウィンドウのデフォルトの幅です。"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "入力した単語の上にスペルエラー表示を描画します。"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "終了時にゴミ箱フォルダを空にする"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolution を終了する際にゴミ箱フォルダを空にします。"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "キャレット・モードを有効にします (メールを読む際にカーソルが表示されます)。"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "キャレット・モードの有効/無効"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "メッセージ一覧表示ペインの高さ"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "メッセージ一覧表示ペインの高さです。"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13289,15 +13419,15 @@ msgstr ""
 "中に表示される MIME 型は、その内容を表示する際に使用される GNOME の MIME 型"
 "データベースを表示する bonobo コンポーネント・ビューアにマップされます。"
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "ラベルと対応する色のリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "アカウントのリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13306,11 +13436,11 @@ msgstr ""
 "は /apps/evolution/mail/accounts からの相対的な名前つきサブ・フォルダが含まれ"
 "ます。"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr "カスタムのヘッダとそれらが有効かどうかのリストです。"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13318,15 +13448,15 @@ msgstr ""
 "Evolution メール・コンポーザで利用するラベルのリストです。このリストには "
 "name:color という形式で HTML で使用する色 (16形式) が含まれています。"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "bonobo コンポーネント・ビューアでチェックする MIME 型のリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "http を介して受信する HTML メッセージの画像読み込み"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13336,181 +13466,173 @@ msgstr ""
 "可能な値: 0: 画像を読み込まない、1: 差出人がアドレス帳に登録されている場合は"
 "読み込む、2: 画像を常に読み込む"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "ログのフィルタリング"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "指定したログ・ファイルに対してログのフィルタリング処理を行います。"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "フィルタリングするログ・ファイル"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "フィルタリング処理の対象となるログファイルです。"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "既読マークを付与するまでの時間"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "メールを指定してから既読マークを付与するまでの時間です。"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "メッセージの \"プレビュー\" で使用する引用記号"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "メッセージの \"プレビュー\" で使用する引用記号です。"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "メッセージの表示スタイル (標準、全てのヘッダ、ソース)"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "新着メールの通知で使用するサウンド・ファイル"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "新着メール通知の種類"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "件名が空の場合に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "フォルダを完全に抹消する前にユーザに警告します。"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "送信するメールの件名が空の場合、送信する前に警告します。"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "ユーザが完全削除する際に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "ユーザが Bcc のみ入力したら警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "希望しない HTML をユーザが送信する前に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 "テキストの中に混入されているリンク情報を識別して、URI タグで置き換えます。"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 "テキストの中に混入されているスマイリーの情報を識別して、画像に置き換えます。"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "メールを受信したらスパムテストを実行する"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"(check_incoming が TRUE の場合) IMAP アカウントで受信するメールに対してジャン"
-"ク・テストを実行します。"
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n です。"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "デフォルトで HTML メールを送信する"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "デフォルトで HTML 形式のメールを送信します。"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "アニメーションの表示可否"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "画像をアニメーションとして表示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "メッセージ一覧の中に削除したメッセージを (打ち消し線を付けて) 表示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "メッセージ一覧の中に削除したメッセージを表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "\"プレビュー\" ウィンドウの表示可否"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "\"プレビュー\" ペインを表示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "新着メールが届いたら演奏するサウンド・ファイルです。"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "ユーザが使用する新着メール通知の種類を指定します。"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "インラインでスペルをチェックする"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "端末のフォント"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "メールを表示するための端末フォントです。"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "メールを表示するための可変幅フォントです。"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13522,101 +13644,101 @@ msgstr ""
 "enabled&gt; - メール表示ペインの中にヘッダを表示する場合は enabled をセットし"
 "ます。"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "メッセージ一覧をスレッド表示にします。"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "メッセージ一覧のスレッド化"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "メッセージ一覧を件名でスレッド表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "既読マークを付与するまでの時間"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "メッセージを選択してから既読マークを付与するまでの時間です。"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "デフォルト・アカウントの UID (文字列) です。"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Spamasssassin デーモンとクライアントを使用する"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 "Spamasssassin デーモンとクライアント (spamc/spamd) で受信したメールを SPAM "
 "フィルタリングします。"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "カスタム・フォントを使用する"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "メールを表示するフォントにカスタム・フォントを使用します。"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "ローカルの SPAM フィルタリングのみ行います。"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ローカルの SPAM フィルタリングのみ行います (DNS 使用せず)。"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "可変幅フォント"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "メニュー [表示]-[Bcc フィールド] の状態"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "メニュー [表示]-[Bcc フィールド] が有効な状態です。"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "\"Cc フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "メニュー [表示]-[Cc フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "\"差出人フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "メニュー [表示]-[差出人フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "\"送信先フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "メニュー [表示]-[送信先フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "\"返信先フィールド\" を表示する"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "メニュー [表示]-[返信先フィールド] が有効であることを示します。"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13624,69 +13746,66 @@ msgstr ""
 "メッセージに In-Reply-To または Refeences ヘッダが無い場合に、件名によるス"
 "レッド表示で fall back するかどうかを指定します。"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "ユーザが起動した spamd のポート番号です。"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "spamd のポート番号"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm インポータ"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox インポータ"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Evolution Netscape メール・インポータ"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine インポータ"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution は古い Elm 形式メールをインポート中です"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "インポート中..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "少々お待ち下さい"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "%s を %s でインポート中"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s の解析中"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "ファイルのインポート"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13694,16 +13813,44 @@ msgstr ""
 "Evolution は Elm メールファイルを発見しました。\n"
 "Evolution へインポートしてもよろしいですか？"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "転送先は読み込み専用"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "%s をインポートしています。\n"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "ファイルのインポート"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "%s の解析中"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "優先度フィルタ \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13728,7 +13875,7 @@ msgstr ""
 "スコアに変換し、優先度の代わりにスコアを利用するフィルタになります。\n"
 "意図したように動作するか、インポートしたフィルタをチェックして下さい。"
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13740,7 +13887,7 @@ msgstr ""
 "Evolution ではこのフィルタリングをサポートしていません。\n"
 "これらのフィルタは将来的に利用できなくなります。"
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13754,31 +13901,24 @@ msgstr ""
 "これらのフィルタは文字列がメールの中に含まれているか否かを\n"
 "テストするように変更されました。"
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution は古い Netscape データのインポート中です"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "メール・フィルタのスキャン中"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "フォルダのスキャン中"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "インポートの開始"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution は古い Netscape データのインポート中です"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "設定"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "メールのフィルタ"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13786,11 +13926,20 @@ msgstr ""
 "Evolution は Netscape メールファイルを発見しました。\n"
 "Evolution へインポートしてもよろしいですか？"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution は古い Pine データのインポート中です"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "ファイルのインポート"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "アドレス帳"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13798,7 +13947,7 @@ msgstr ""
 "Evolution は Pine メールファイルを発見しました。\n"
 "Evolution へインポートしてもよろしいですか？"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13841,19 +13990,19 @@ msgid "You have not filled in all of the required information."
 msgstr "必要な情報の全てを埋めていません。"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウント・エディタ"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "ユーザ名:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "パス(_P):"
 
@@ -13905,27 +14054,42 @@ msgstr ""
 "     '%s'\n"
 "更に更新されています。"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "送信していないメッセージがあります。それでも終了しますか？"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "新しいメッセージ"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "新しい仮想フォルダ"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "メールのフィルタ"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "新しいカレンダを作成します"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "表示するメール・ソースの URI"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "身元情報"
 
@@ -13967,7 +14131,7 @@ msgstr ""
 "メールを送信する方法について情報を入力して下さい。不明な場合は、システム管理"
 "者またはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "アカウント管理"
 
@@ -13992,119 +14156,115 @@ msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " サポートしているかチェックする(_C) "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(この Evolution は SSL サポート付きで作成されていません)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(この Evolution は SSL サポート付きで作成されていません)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>表示するヘッダの項目(_D)</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "暗号化したメールを送信する場合は、メール全体も暗号化する(_L)"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "アカウント・エディタ"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "アカウント情報"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "スクリプトの追加(_R)"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "新しい署名の追加..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_W)"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "常に使用する Bcc 先(_B):"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "常に使用する CC 先(_C):"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "暗号解読時に常に信用キーを使用する(_T)"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "オリジナルのメッセージを添付する"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "添付する"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "認証方式"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルチック語 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルチック語 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "文字セット(_H):"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "色(_O)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "受信時にチェックする(_I)"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "入力時にスペル・チェックする(_T)"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "新着メールのチェック"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 "受信したメール・メッセージがジャンク (SPAM; UCE, UBE) かどうかチェックします"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "スペルミスした文字の色(_M):"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "メッセージの生成"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "設定"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14120,277 +14280,273 @@ msgstr ""
 "\n"
 "\"適用\" をクリックして設定を保存して下さい。"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "デフォルトの動作"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "デフォルトの文字エンコード(_E): "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "メールの削除中"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "送信するメッセージにデジタル署名する (デフォルト)(_S)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "IMAP アカウントの受信メールは除外する(_N)"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "オリジナルのメッセージを引用しない"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "会議開催要求に合意しない (Outlook 互換)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "草案フォルダ(_F):"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-メール・アカウント"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-メール・アドレス(_A):"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "終了時にゴミ箱フォルダを空にする(_T)"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "暗号化する証明書(_P):"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウント・アシスタント"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "コマンドの実行..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "固定幅(_X):"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "フィルタリングのオプション"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "フォントのプロパティ"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "HTML の中のメッセージを整形する(_H)"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "ヘッダ(_E)"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "引用を強調表示する(_Q)"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "インラインにする"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "ラベルと色"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "画像の読み込み"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "メールボックスの場所"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "メッセージ作成"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "メッセージの表示"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "メッセージのフォント"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "新着メールの通知"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意: 最初に接続するまで、パスワードの入力は求められません。"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "追加情報"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "組織(_G):"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GnuPG キー ID(_K):"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "色の選択"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Bcc 受信者のみ指定されている場合は送信する前に確認する(_O)"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ちょっとしたプライバシー (PGP/GnuPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "印刷用フォント"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "オリジナルのメッセージを引用する"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "引用する"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "このパスワードを記憶する(_M)"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "返信先(_P):"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "返信オプション(_O)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "このパスワードを記憶する(_P)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "必須情報"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "初期値に戻す"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "セキュリティ(_E)"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "セキュリティ保護された MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "HTML 表示の固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "印刷時の HTML 固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "HtML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "印刷時の HTML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "送信済フォルダ(_M):"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "送信済と草案メッセージ"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "サーバ認証を行う(_V)"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "サーバの設定"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "サーバ種別(_T):"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "署名する証明書(_G):"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "ファイル名の指定(_F):"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "スペル・チェック(_C)"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14399,7 +14555,7 @@ msgstr ""
 "このスクリプトの出力を署名として使用します。\n"
 "\"名前\" は表示の目的でのみ使用されます。"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14408,7 +14564,7 @@ msgstr ""
 "このページでは、スペル・チェックとその対象言語を設定します。インストールした"
 "辞書の言語のみ一覧に表示されます。"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14416,15 +14572,15 @@ msgstr ""
 "このアカウントに対してお好みの名前を入力して下さい。\n"
 "(例: \"仕事\" または \"プライベート\")"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "デーモンを使用する(_D)"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "可変幅(_A):"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14434,171 +14590,171 @@ msgstr ""
 "\n"
 "\"進む\" ボタンをクリックして下さい。"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "署名の追加(_A)"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "常に画像を読み込まない(_A)"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_Y)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "認証種別(_A): "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "認証方法(_A): "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "新着メールを自動的にチェックする(_A)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "スマイリー・アイコンを自動的に挿入する(_A)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "新着メールが届いたらビープ音を鳴らす(_B)"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "フォルダを抹消する前に確認する(_C)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "デフォルトの署名(_D):"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "デフォルト(_D)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "新着メールが届いても通知しない(_D)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "有効(_E)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "送信メッセージを暗号化する (デフォルト)(_E)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "氏名(_F):"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "HTML 形式のメール(_H)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "身元情報(_I)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "ジャンク(_J)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "アドレス帳に登録された差出人の場合は画像を読み込む(_L)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "ローカル・メールのチェックのみ(_L)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "これをデフォルトのアカウントにする(_M)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "メッセージに\"既読\"マークを付与する時間(_M)"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "二度と画像を読み込まない(_N)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "新着メールが届いたらサウンドを演奏する(_P)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML 形式を希望しない連絡先へ送信する場合は確認する(_P)"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "件名が空の場合は送信する前に確認する(_P)"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "メールの受信(_R)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "返信方法(_R):"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "初期値に戻す(_R)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "スクリプト(_S):"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "選択(_S)..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "メールの送信(_S)"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "アニメーションを表示する(_S)"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "署名(_S):"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "標準フォント(_S):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "端末のフォント(_T):"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "セキュリティ保護された接続 (SSL) の利用(_U):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "説明"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s へ ping"
@@ -14621,7 +14777,7 @@ msgstr ""
 "次の操作を実行する際にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "作業"
 
@@ -14633,12 +14789,12 @@ msgstr "フォルダのフィルタリング中"
 msgid "Fetching Mail"
 msgstr "メールの同期中"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "出力フィルタの適用に失敗しました: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14647,116 +14803,116 @@ msgstr ""
 "%s への追加に失敗しました: %s\n"
 "かわりにローカルの '送信箱' へ追加します。"
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ローカルの '送信箱' フォルダへの追加に失敗しました: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d 通を送信中"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "メッセージ %d / %d 通は失敗しました"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "転送メッセージ"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープンする"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープンする"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "フォルダ %s を削除"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "フォルダ '%s' の格納"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "アカウント '%s' の削除と保存"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "アカウント '%s' の格納"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "フォルダを更新中"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "フォルダを抹消中"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' の中にあるゴミ箱を空にする"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "ローカル・フォルダ"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "メッセージ %d 通の受信中"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "メッセージ %d 通の保存中"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14765,7 +14921,7 @@ msgstr ""
 "出力ファイルを生成できません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14774,11 +14930,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "添付した内容の保存中"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14787,22 +14943,22 @@ msgstr ""
 "出力ファイルを生成できません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出せませんでした: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s からの接続はありません"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s へ再接続"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Junk のステータス変更"
 
@@ -14834,38 +14990,38 @@ msgstr "暗号化"
 msgid "Security Information"
 msgstr "セキュリティ情報"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "キャンセル中..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "サーバ: %s  種別: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "パス: %s  種類: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "種別: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "メールの送信/受信"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "全てキャンセル(_A)"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "更新中..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "待機中..."
 
@@ -14972,20 +15128,20 @@ msgstr ""
 "     '%s'\n"
 "更に更新されています。"
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "仮想フォルダの編集"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "存在しない仮想フォルダ '%s' を編集しようとしています。"
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "新しい仮想フォルダ"
 
@@ -15452,7 +15608,7 @@ msgstr "インポータを実行できません"
 msgid "_Import"
 msgstr "インポート(_I)"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
@@ -15490,6 +15646,10 @@ msgstr "共有フォルダが開けませんでした: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "指定した共有フォルダが見つかりません。"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "インポートの開始"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15909,45 +16069,45 @@ msgstr ""
 "%s: --online と --offline は同時には使用できません。\n"
 "  詳細は %s --help をご覧下さい。\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "インポートする証明書の選択..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "利用の目的"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "有効期限"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "証明書ビューア: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "'%s' のパスワードを入力して下さい"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -15956,7 +16116,7 @@ msgstr ""
 "発行先:\n"
 "  件名: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16021,7 +16181,7 @@ msgstr ""
 "認証局 (CA) を信用する前に、(可能であれば) その証明書やポリシー、そして手続き"
 "をよく調べる必要があります。"
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "証明書"
 
@@ -16086,11 +16246,11 @@ msgstr "組織の単位 (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL クライアント証明書"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL サーバ証明書"
 
@@ -16135,209 +16295,209 @@ msgstr "次の人達の身元を確認できる証明書 (ファイル) があ�
 msgid "Your Certificates"
 msgstr "ユーザの証明書"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "既に証明書があります"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "バージョン"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "バージョン１"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "バージョン２"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "バージョン３"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "RSA で暗号化された PKCS #1 MD2"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "RSA で暗号化された PKCS #1 MD5"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "RSA で暗号化された PKCS #1 SHA-1"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 暗号化"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "認証の鍵の用法"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Netscape 証明書の種類"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "認証局の鍵の識別子"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "オブジェクトの識別子 (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "アルゴリズムの識別子"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "アルゴリズムの引数"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "主体者公開鍵情報"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "主体者公開鍵のアルゴリズム"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "主体者公開鍵"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "エラー: 拡張処理できません"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "オブジェクトの署名者"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "SSL 認証局"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "E-メール認証局"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "署名中"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "容認"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "鍵の暗号化"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "データの暗号化"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "鍵の約款"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "証明書の署名者"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "CRL の署名者"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "危険"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "危険ではない"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "拡張"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "証明書の署名アルゴリズム"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "発行者"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "発行者の重複しない ID"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "件名の重複しない ID"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "証明書の署名の値"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ファイルのパスワード"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ファイルのパスワードを入力して下さい:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "インポートした証明書"
 
@@ -16924,7 +17084,8 @@ msgid "_Threaded Message List"
 msgstr "メッセージ一覧のスレッド化(_T)"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "差出人をアドレス帳に追加(_D)"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -16932,7 +17093,8 @@ msgid "A_pply Filters"
 msgstr "フィルタの適用(_P)"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "差出人をアドレス帳に追加します"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17377,10 +17539,6 @@ msgstr "形式(_M)"
 msgid "HT_ML"
 msgstr "HTML(_M)"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "開く"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "ファイルを開く"
@@ -17741,22 +17899,6 @@ msgstr "送受信(_S)"
 msgid "_Window"
 msgstr "ウィンドウ(_W)"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "サマリを印刷します"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "サマリを印刷します"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "再読込み"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "表示を更新します"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "企業順(_C)"
@@ -17817,8 +17959,8 @@ msgstr "カテゴリ付き(_C)"
 msgid "_Tasks"
 msgstr "タスク(_T)"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18061,23 +18203,23 @@ msgstr "検索(_S)"
 msgid "_Find Now"
 msgstr "今すぐ見つける(_F)"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "クリア(_C)"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "アイテム ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "サブアイテム ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "テキスト"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "今すぐ見つける(_N)"
 
@@ -18090,3 +18232,73 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
+
+#~ msgid "Addressbook Sources"
+#~ msgstr "アドレス帳のソース"
+
+#~ msgid "No data provided"
+#~ msgstr "期日が指定されていません"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ファイル '%s' を開けませんでした:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "フォルダ '%s' を作成できませんでした:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ファイル '%s' を作成できませんでした:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "'%s' はフォルダではありません"
+
+#~ msgid "On this Computer"
+#~ msgstr "このコンピュータ"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "IMAP アカウントの受信メールがジャンクかどうかチェックする"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "(check_incoming が TRUE の場合) IMAP アカウントで受信するメールに対して"
+#~ "ジャンク・テストを実行します。"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "%s を %s でインポート中"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "メール・フィルタのスキャン中"
+
+#~ msgid "Scanning directory"
+#~ msgstr "フォルダのスキャン中"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "IMAP アカウントの受信メールは除外する(_N)"
+
+#~ msgid "Print Summary"
+#~ msgstr "サマリを印刷します"
+
+#~ msgid "Print summary"
+#~ msgstr "サマリを印刷します"
+
+#~ msgid "Reload"
+#~ msgstr "再読込み"
+
+#~ msgid "Reload the view"
+#~ msgstr "表示を更新します"
diff --git a/po/ko.po b/po/ko.po
index 26682a53e5..fb29065925 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-06 02:44+0900\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-03-06 02:49+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addressbook/conduit/address-conduit.c:272
@@ -46,7 +46,6 @@ msgstr "여기서 자동 완성을 설정합니다"
 #. 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:363
@@ -189,7 +188,6 @@ 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:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
 #: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
@@ -198,7 +196,6 @@ msgid "On This Computer"
 msgstr "이 컴퓨터"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
@@ -3091,19 +3088,19 @@ msgid "GTK Tree View"
 msgstr "GTk 트리 뷰"
 
 # 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow 테스트"
 
 # 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
 # 테스트 프로그램
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "reflow canvas item을 테스트합니다"
 
@@ -3810,10 +3807,6 @@ 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.
-#. 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:692
 #: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -4937,11 +4930,6 @@ 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:591 composer/e-msg-composer.c:2084
@@ -5845,20 +5833,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5882,10 +5862,6 @@ msgstr "%02i분 단위"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5893,9 +5869,6 @@ msgstr "%b %-d일 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6471,10 +6444,6 @@ msgstr "%Y년 %b %-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
@@ -6483,10 +6452,6 @@ msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
@@ -11816,16 +11781,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"
@@ -11877,31 +11838,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
diff --git a/po/lt.po b/po/lt.po
index 2ec985b69f..01afa3c639 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -50,8 +50,7 @@ msgstr "Nustatykite automatinį užbaigimą čia"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontaktai"
 
@@ -91,20 +90,21 @@ msgstr "Evolution aplankų nustatymų valdymas"
 msgid "Manager your S/Mime certificates here"
 msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, 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-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Nauja Adresų Knyga"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -112,65 +112,65 @@ msgstr "Nauja Adresų Knyga"
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Savybės..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Sukurti naują kontaktą"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Naujas kontaktų sąrašas"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Kontaktų sąrašas"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Sukurti naują kontaktų sąrašą"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Nepavyko susisiekti su LDAP serveriu"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nepavyko autentifikavimasis su LDAP serverių"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Negalima daryti užklausos tarp pagrindinio DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Serveris nepateikė tinkamų paieškos platformų"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Šis serveris nepalaiko LDAPv3 schemų informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Klaida gaunant schemų informaciją"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Serveris nepateikė tvarkingos schemų informacijos"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Perkeliama..."
 
@@ -187,40 +187,42 @@ msgstr ""
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Perkeliamas „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Šiame Kompiuteryje"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Asmeninis"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Tarp LDAP Serverių"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP Serveriai"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Savaiminis pabaigimas"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -232,7 +234,7 @@ msgstr ""
 "padidinkite išvedamų atsakymų kiekio apribojimus tarp šios\n"
 "adresų knygos katalogo serverio nustatymų."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -244,19 +246,19 @@ msgstr ""
 "padidinkite laiko ribas nustatytas šios adresų knygos katalogo\n"
 "serverio nustatymuose."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Šios adresų knygos posistemė negali apdoroti pateiktos užklausos."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Šios adresų knygos posistemė atsisakė apdoroti pateiktą užklausą."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Ši užklausa nesibaigė sėkmingai."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -264,7 +266,7 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygelės. Patikrinkite, ar kelias egzistuoja "
 "ir ar Jūs turite teises jį pasiekti."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -272,7 +274,7 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
 "neteisingą adresą arba nurodytas LDAP serveris yra nepasiekiamas."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -282,7 +284,7 @@ msgstr ""
 "naudoti LDAP su Evolution, Jums teks sukompiliuoti programą iš pradinių "
 "tekstų prieš tai įdiegus OpenLDAP iš žemiau esančio adreso."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -290,27 +292,32 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
 "neteisingą adresą arba nurodytas serveris yra nepasiekiamas."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adresų knygelės"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Susisiekiama su LDAP serveriu anonimiškai"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Autorizacija nepavyko.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "Išvedamų kontaktų šaltinio ID"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, kurį rodys kalendorius"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList xml skirtas adresų užbaigimo sąrašui"
@@ -357,7 +364,7 @@ msgstr "  _Rodyti Palaikomas Bazes "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -389,19 +396,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Adresų Knygos Kūrimo Pagalbininkas"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Adresų knygelės savybės"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adresų knygelės šaltinis"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adresų Knygos Šaltiniai..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Visada"
 
@@ -412,7 +422,8 @@ msgstr "Anonimiškai"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -420,51 +431,51 @@ msgstr ""
 "\n"
 "Paspauskite „Pabaigti“ mygtuką, kad išsaugoti dabar įvestus nustatymus."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Skirtinis _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Baigta"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Esmė"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupė:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Niekada"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -481,23 +492,23 @@ msgstr ""
 "serveris naudoja\n"
 "šiuos protokolus."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Pai_eškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Ieškoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Pasirinkta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -507,7 +518,7 @@ msgstr ""
 "serverio tik tuo atveju,\n"
 "jei LDAP serveris palaikys SSL arba TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -525,7 +536,7 @@ msgstr ""
 "nes Jūsų jungtis\n"
 "yra apsaugota nuo išorinių įsilaužėlių."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -538,7 +549,7 @@ msgstr ""
 "kad Jūsų jungtis nebus apsaugota ir Jums gresia duomenų ar jungties "
 "perėmimas. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -549,39 +560,41 @@ msgstr ""
 "paieškų\n"
 "bei kontaktų kūrimo/keitimo nustatymus. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Pirmiausiai kuriant adresų knygą reikia nustatyti išvedamą vardą ir grupę."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "1-as žingsnis: Aplanko Savybės"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "2-as žingsnis: Serverio Informacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "3-as žingsnis: Jungiamasi prie Serverio"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "4-as žingsnis: Vykdoma paieška kataloge"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -595,7 +608,7 @@ msgstr ""
 "jei Jums\n"
 "reikia pakeisti čia esančias reikšmes."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -607,7 +620,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -622,11 +635,13 @@ msgstr ""
 "sritis „one“\n"
 "pateiks tik pirmame paieškos bazės lygyje esančius įrašus.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -636,7 +651,7 @@ msgstr ""
 "tekti pateikti papildomus parametrus. Susisiekite su savo\n"
 "sistemos administratoriumi, jei Jūs neturėsite reikiamos informacijos."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -644,16 +659,17 @@ msgstr ""
 "Čia nurodomas pilnas Jūsų LDAP serverio vardas. Pavyzdžiui „ldap.example."
 "com“."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Čia yra nurodomas didžiasias atsiunčiamų įrašų kiekis. Nustačius per didelę\n"
 "reikšmę gali sulėtėti Jūsų adresų knygos darbas."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -663,7 +679,7 @@ msgstr ""
 "pasinaudoti „El. pašto adreso“ metodu būtinas anoniminis prisijungimas prie "
 "Jūsų LDAP serverio."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -672,7 +688,7 @@ msgstr ""
 "Šis vardas bus priskirtas serveriui Evolution aplankų sąraše.\n"
 "Jis skirtas tiktai vaizdavimui."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -681,7 +697,7 @@ msgstr ""
 "Šis vardas bus naudojamasi Evolution programos aplankų sąraše. Jis skirtas "
 "tiktai vaizdavimui."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -692,28 +708,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Naudoti _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Naudojamas skirtinis vardas (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Naudojamas el. pašto adresas"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kai tik imanoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -725,19 +741,19 @@ msgstr ""
 "parametrus. Pasiteiraukite savo sistemos administratoriaus, jei Jūs nesate "
 "tikri dėl to, ką čia reikia įvesti."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Ro_domas vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -746,39 +762,39 @@ msgstr "_Leistinas atsiuntimo greitis:"
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Prisijungimo metodas"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Pauzės riba (minutėmis):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kortelės"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "jungties-kortelė"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "bendrinė-kortelė"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "paieškos-kortelė"
 
@@ -893,7 +909,7 @@ msgstr "Bendradarbiavimas"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
@@ -986,10 +1002,10 @@ msgstr "_Kategorijos..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1037,15 +1053,15 @@ msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2030,105 +2046,114 @@ msgid "AOL Instant Messenger"
 msgstr "Skubios žinutės"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Pašto laiškas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Paslauga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Vieta:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Vartotojo _vardas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Namų"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Darbinis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Pradinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Tikslinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Tai Naujas Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Keičiami Laukai"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Pakeista"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Abonemento vardas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategorijų redaktorius nepasiekiamas."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontaktas priklauso šioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Išsaugoti kontaktą tarp VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2136,7 +2161,7 @@ msgstr ""
 "Ar Jūs tikrai norite\n"
 "ištrinti šiuos kontaktus?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2144,46 +2169,51 @@ msgstr ""
 "Ar tu tikrai nori\n"
 "ištrinti šį kontaktą?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Darbo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nepavyko rasti lauko objekto: „%s“"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas pridėjimas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Taisyti Pilną"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Pilnas vardas:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "El. paštas"
 
@@ -2343,11 +2373,11 @@ msgid "Is New List"
 msgstr "Tai Naujas Sąrašas"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktų sąrašo redaktorius"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Išsaugoti Sąrašą tarp VCard"
 
@@ -2436,13 +2466,13 @@ msgid "Email begins with"
 msgstr "El. paštas prasideda"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
@@ -2459,101 +2489,101 @@ msgid "Type"
 msgstr "Tipas"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
-msgstr "Adresų knygelė"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "Adresų _Knyga:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Išsaugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Naujas Kontaktas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Naujas Kontaktų Sąrašas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Eiti į Aplanką..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Ieškoti Kontaktų..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adresų Knygos Šaltiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot Nustatymai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persiųsti kontaktą"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Siųsti laišką kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Spausdinti voką"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iškirpti"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopijuoti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Įdėti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Esamas vaizdas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2565,8 +2595,8 @@ msgstr ""
 "darbas. Jums teks paleisti Evolution iš naujo tam, kad pasinaudoti ja vėl"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
@@ -2609,7 +2639,7 @@ msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "El. paštas"
 
@@ -2668,7 +2698,7 @@ msgid "Nickname"
 msgstr "Pravardė"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Pastaba"
 
@@ -2677,7 +2707,7 @@ msgid "Office"
 msgstr "Ofisas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -2803,67 +2833,73 @@ msgstr "Parinkta"
 msgid "Has Cursor"
 msgstr "Turi Žymeklį"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Parodyti Sąrašą"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "El. paštas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Darbinis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Aprašymas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupė"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Vaizdo Konferencijų Adresas:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Asmeninis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Žurnalas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Pareigos"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Namų puslapis"
 
@@ -2872,8 +2908,8 @@ msgid "Success"
 msgstr "Sėkmė"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2903,7 +2939,7 @@ msgstr "Protokolas nepalaikomas"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2923,7 +2959,8 @@ msgid "TLS not Available"
 msgstr "TLS Negalimas"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adresų Knyga neegzistuoja"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3058,7 +3095,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Pridėti adresą prie esančio kontakto „%s“"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Užklausiama adresų knygelė..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3113,17 +3151,40 @@ msgstr "Autorinės teisės (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Čia turi būti patikrintas reflow canvas elementas"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm importavimo priemonė"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar importas"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar importas"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Spausdinti kontaktą"
 
@@ -3215,7 +3276,7 @@ msgstr "Paraštės"
 msgid "Number of columns:"
 msgstr "Stulpelių skaičius:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Parinktys"
 
@@ -3396,8 +3457,8 @@ msgstr "Nenurodytas bylos vardas."
 msgid "Unnamed List"
 msgstr "Bevardis Sąrašas"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
 
@@ -3475,10 +3536,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Užduotys"
 
@@ -3522,26 +3582,26 @@ msgstr "Užtildymo laikas (minutėmis)"
 msgid "_Edit appointment"
 msgstr "K_eisti įvykį"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "Ati_daryti"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Atidaryti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "A_tšaukti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "_Atšaukti Visus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Nėra jokios aprašymo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3554,12 +3614,12 @@ msgstr ""
 "Prasideda %s\n"
 "Baigiasi %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3571,7 +3631,7 @@ msgstr ""
 "siųstų laišką.  Evolution vietoj to parodys normalų\n"
 "užuominos dialogą."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3588,19 +3648,19 @@ msgstr ""
 "\n"
 "Ar Jūs esate tikras, kad ši komanda turi būti paleista?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Kitą kartą nebeklausti apie šią programą."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Negalėjau inicializuoti Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Negalėjau inicializuoti gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nepavyko sukurti aliarmo pranešimų tarnybos gamyklos"
 
@@ -3738,24 +3798,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Ar rodyti savaičių numerius datos navigatoriuje"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Santrauka turi savyje"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Aprašymas turi savyje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Aprašymas turi savyje"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Netinkantys"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendorius"
 
@@ -3784,7 +3850,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3806,70 +3872,70 @@ msgstr "%Y m. %B %d d."
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Naujas Kalendorius"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Naujas paskyrimas"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "P_askyrimas"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Sukurti naują įvykį"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Naujas susitikimas"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Susitikimas"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Sukurti naują susitikimo užklausimą"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Nauji visos dienos paskyrimai"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Visos dienos praskyrimai"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Sukurti naują visos dienos paskyrimą"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Naujas kalendorius"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "K_alendorius"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, 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:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nėra sukurta kalendoriaus naudojamo įvykių bei susitikimų saugojimui"
 
@@ -4001,7 +4067,7 @@ msgstr "valandų"
 msgid "minutes"
 msgstr "minučių"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Veiksmas/Jungiklis"
 
@@ -4073,7 +4139,7 @@ msgid "hour(s)"
 msgstr "valandą(as)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutę(es)"
 
@@ -4084,7 +4150,7 @@ msgstr "įvykio pradž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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Įjungta"
 
@@ -4136,7 +4202,7 @@ msgstr "30 minučių"
 msgid "60 minutes"
 msgstr "60 minučių"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Perspėjimai"
 
@@ -4161,7 +4227,7 @@ msgid "Days"
 msgstr "Dienų"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Įju_ngti"
 
@@ -4301,7 +4367,7 @@ msgid "_Fri"
 msgstr "Pe_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Esmė"
 
@@ -4400,7 +4466,7 @@ msgstr ""
 "Paspauskite „Pabaigti“ mygtuką, kad išsaugoti dabar įvestus nustatymus."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Naujas Užduočių sąrašas"
 
@@ -4565,23 +4631,23 @@ msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
 msgid "Validation error: %s"
 msgstr "Tikrinimo klaida: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " iki "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Užbaigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Užbaigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Iki "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Iki"
 
@@ -4617,8 +4683,8 @@ msgstr "Žurnalo įrašas -- %s"
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Išsaugoti kaip..."
 
@@ -4647,10 +4713,21 @@ msgstr "Paskirties vieta"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Nurodykite galutinį dokumentą"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendorius"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Naujas užduočių sąrašas"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4753,7 +4830,7 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Įvykis"
 
@@ -4777,23 +4854,32 @@ msgstr "Dienotvarkė"
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Galutinis terminas yra anksčiau už pradžią!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Klaidinga pradžios data"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Klaidinga pabaigos data"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Klaidingas pradžios laikas"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Klaidingas pabaigos laikas"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nepavyko atidaryti kalendoriaus „%s“."
@@ -4869,29 +4955,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Pasirinktas organizatorius nebeturi sąskaitos."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Būtinas bent vienas dalyvis."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
@@ -5076,7 +5162,7 @@ msgstr " "
 msgid "occurrences"
 msgstr "kartą(us) pasitaikys"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Data/Laikas"
 
@@ -5109,7 +5195,7 @@ msgid "_No recurrence"
 msgstr "_Jokio pakartojimo"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Pašalinti"
 
@@ -5151,7 +5237,7 @@ msgstr ""
 "\n"
 "Ar norėtumėte išsaugoti pakeitimus?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Atsikratyti Pakeitimų"
 
@@ -5175,7 +5261,7 @@ msgstr "Užduoties priskyrimas buvo sukurtas. Ar išsiųsti informaciją?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Užduoties informacija buvo pakeista. Siųsti atnaujintą informaciją?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Pabaigos data klaidinga"
 
@@ -5188,7 +5274,7 @@ msgstr "% _Baigta"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Užbaigta"
 
@@ -5201,7 +5287,7 @@ msgstr "Aukštas"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Vykdoma"
 
@@ -5220,7 +5306,7 @@ msgstr "Normalus"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nepradėta"
 
@@ -5259,16 +5345,16 @@ msgstr "Esmė"
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Galutinio termino data klaidinga"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Galutinis terminas yra anksčiau už pradžią!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nepavyko atverti „%s“ užduočių."
@@ -5279,7 +5365,7 @@ msgstr "S_laptas"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Aprašymas:"
 
@@ -5472,11 +5558,10 @@ msgstr "Pradžios data"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Apžvalga"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "spalva"
 
@@ -5501,7 +5586,7 @@ msgstr "Š"
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "R"
 
@@ -5536,10 +5621,10 @@ msgstr "Ne"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nežinomas"
@@ -5552,99 +5637,105 @@ msgstr "Pasikartojantis"
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Atnaujinami objektai"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Naujas Susitikimas"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "Į_dėti"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Eiti į šia_ndieną"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Eiti į datą..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "Ati_daryti"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Iš_saugoti kaip..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti Susitikimą..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Nuo_statos..."
 
@@ -5731,7 +5822,7 @@ msgid "Alarms"
 msgstr "Perspėjimai"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Užbaigta"
 
@@ -5789,26 +5880,26 @@ msgstr "%02i minučių padalos"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr " "
@@ -5991,7 +6082,7 @@ msgid "Send Latest Information"
 msgstr "Nusiųsti Paskutinę Informaciją"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
@@ -6450,12 +6541,12 @@ msgstr "Prioritetas:"
 msgid "Web Page:"
 msgstr "Tinklalapis:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Paspauskite, kad atidaryti %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6465,7 +6556,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6473,12 +6564,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys tarp %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6487,28 +6578,38 @@ msgstr ""
 "Klaida atidarant %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Išvaloma"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Įkeliamos užduotys"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Įvykis -- %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Atidaroma %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6627,16 +6728,16 @@ msgstr "Laisvas/užsiėmęs informacija (nuo %s iki %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informacija"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Tu turi būti įvykio dalyvis."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Įveskite „%s“ slaptažodį"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -6649,7 +6750,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
@@ -6662,12 +6763,12 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Gimtadieniai ir Sukaktuvės"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Tinkle"
 
@@ -6856,49 +6957,49 @@ msgstr "Pasirinktas mėnuo (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Užduotis"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Būklė: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritetas: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Įvykdymo Procentas: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorijos: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontaktai: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Spaudinio peržiūra"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Spausdinti elementą"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
@@ -6908,36 +7009,36 @@ 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:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Užduotis"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Naujas užduočių sąrašas"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Užduočių sąrašas"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Sukurti naują užduočių sąrašą"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, 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:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Nėra kalendoriaus, kuriame galima būtų kurti užduotis"
 
@@ -6994,20 +7095,20 @@ msgstr "iCalendar bylos (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar bylos (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Pašalinti visus paskyrimus ir susitikimus"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Priminimas!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalendoriaus Įvykiai"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7015,7 +7116,7 @@ msgstr ""
 "Evolution aptiko Gnome Galendar bylas.\n"
 "Ar norėtumėte jas įkelti į Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Kalendorius"
 
@@ -8677,7 +8778,7 @@ msgstr "Negaliu atidaryti laiško"
 msgid "Failed on message %d"
 msgstr "Nesėkmė ties laišku %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
@@ -8762,7 +8863,7 @@ msgstr "Kopijuojami pranešimai"
 msgid "Filtering new message(s)"
 msgstr "Filtruojami nauji pranešimai"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8773,15 +8874,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepavyko apdoroti gpg userid patarimo."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepavyko apdoroti gpg slaptažodžio užklausos."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8790,32 +8891,28 @@ msgstr ""
 "Jūs turi pateikti slaptažodį, kuris atblokuoja raktą, skirtą\n"
 "vartotojui: „%s“"
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Netikėtas atsakymas iš GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nepateikta jokių duomenų"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nepavyko užkoduoti: Nenurodyti tinkamo gavėjai."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8826,58 +8923,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG klaida %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepavyko paleisti gpg programos: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Nepavyko paleisti gpg programos."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Ši laiško dalis yra pasirašyta skaitmeniniu būdu"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nepavyko patikrinti laiško parašo: Klaidingas laiško formatas"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nepavyko sukurti užkoduojančių duomenų: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Ši laiško dalis yra užkoduota skaitmeniu būdu"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Koduotas turinys"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Nepavyko apdoroti laiško turinio"
 
@@ -8987,21 +9084,34 @@ msgstr "Nepavyko apkoduoti MIME bloko: klaidinga struktūra"
 msgid "parse error"
 msgstr "apdorojimo klaida"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Virtualių aplankų pašto tiekėjas."
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Pašto skaitymui naudojant užklausą iš kitų aplankų aibės"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Negalėjau įkelti %s: Modulių įkėlimas šioje sistemoje nepalaikomas."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Negalėjau įkelti %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Negalėjau įkelti %s: Modulyje nėra inicializacijos kodo."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Protokolui „%s“ nėra tiekėjo."
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anoniminis"
@@ -9162,7 +9272,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas iš serverio."
 
@@ -9301,20 +9411,7 @@ msgstr "Adreso atpažinimo klaida: adresas nerastas"
 msgid "Host lookup failed: unknown reason"
 msgstr "Adreso atpažinimo klaida: nežinoma priežastis"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Virtualių aplankų pašto tiekėjas."
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Pašto skaitymui naudojant užklausą iš kitų aplankų aibės"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Protokolui „%s“ nėra tiekėjo."
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9377,21 +9474,25 @@ msgstr "Pasirašė: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nepavyko pasiekti aplanko: Neleistina šios saugyklos operacija"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nepavyko sukurti aplanko: Neleistina šios saugyklos operacija"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Šiukšlės"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Šiukšlės"
@@ -9623,21 +9724,31 @@ msgstr "Nėra tokio laiško %s aplanke %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9653,15 +9764,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Pritaikyti filtrus naujiems laiškams šio serverio INBOX aplanke"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatiškai sulyginti nutolusį ir vietinį paštą"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adresų _Knyga:"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9682,44 +9788,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Skirtas pasiekti Novel Groupwise serverius"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Slaptažodis"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Su šia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slaptažodis."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Įprastas"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "sąrašas"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netikėtai atsijungė: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9728,26 +9832,26 @@ msgstr ""
 "Perspėjimas gautas iš IMAP serverio %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baigėsi per anksti."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Netikėtas atsakymas OK iš IMAP serverio: %s"
@@ -9762,7 +9866,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Aplankas serveryje buvo sunaikintas ir vėl sukurtas."
 
@@ -9771,12 +9875,12 @@ msgstr "Aplankas serveryje buvo sunaikintas ir vėl sukurtas."
 msgid "Scanning for changed messages"
 msgstr "Ieškoma pakeistų laiškų"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepavyko gauti laiško: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9792,25 +9896,25 @@ msgstr ""
 "Negaliu gauti laiško: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Šis laiškas šiuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Atsiunčiama naujų laiškų santrauka"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Negalėjau rasti laiško teksto FETCH atsakyme"
 
@@ -9865,27 +9969,37 @@ msgstr "Vardų zona"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Pritaikyti filtrus naujiems laiškams šio serverio INBOX aplanke"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Patikrinti, ar yra naujų laiškų visuose aplankuose"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Patikrinti, ar yra naujų laiškų visuose aplankuose"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP serveris %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP tarnyba, skirta %s tarp %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9894,64 +10008,64 @@ msgstr "IMAP tarnyba, skirta %s tarp %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL komunikacijų klaida"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nepavyko prisijungti naudojant komandą „%s“: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Tu neįvedei slaptažodžio."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9961,24 +10075,32 @@ msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Nėra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%c“"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nežinomas aukštesnysis aplankas: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Tėvinis aplankas negali turėti vaikinių aplankų"
 
@@ -10004,7 +10126,7 @@ msgstr ""
 "\n"
 " !!! NENAUDOTI DARBINIO PAŠTO APLINKOJE !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nepavyko prisijungti prie %s POP serverio"
@@ -10088,8 +10210,8 @@ msgstr ""
 "struktūras."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10101,55 +10223,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Negalėjau gauti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Vietinėse saugyklose nėra inbox"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Vietinė pašto byla %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nepavyko pervardinti „%s“: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nepavyko ištrinti aplanko meta bylos „%s“: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Negalėjau išsaugoti santraukos: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepavyko pridėti laiško į santrauką: nežinoma priežastis"
 
@@ -10167,53 +10289,44 @@ msgstr "Negalėjau pridurti laiško prie maildir aplanko: %s: %s"
 msgid "Invalid message contents"
 msgstr "Blogas laiško turinys"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Negalėjau atidaryti aplanko „%s“:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Nėra tokio aplanko „%s“."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Negalėjau sukurti aplanko: „%s“:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "„%s“ nėra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negalėjau ištrinti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10235,9 +10348,9 @@ msgid "Checking for new messages"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Įrašomas aplankas"
@@ -10281,156 +10394,134 @@ msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti laiško: Sugadinta pašto dėžutė?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Negalėjau atidaryti bylos „%s“: \n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Negalima sukurti aplanko su tokiu vardu"
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nepavyko sukurti katalogo „%s“:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Negaliu prisegti bylos %s: ne paprasta byla"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Negalėjau sukurti bylos „%s“:\n"
+"Negalėjau ištrinti aplanko „%s“:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "„%s“ nėra paprasta byla."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Negalėjau ištrinti aplanko „%s“:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas „%s“ nėra tuščias. Neištryniau."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Negalima sukurti aplanko su tokiu vardu"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Negaliu sukurti katalogo „%s“: %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Toks aplankas jau yra"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Naujasis aplanko vardas yra neleistinas."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nepavyko pervardinti „%s“: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Negalima pervardinti %s į %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Negalėjau atidaryti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Kritinė pašto apdorojomo klaida ties %ld eilute aplanke %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Negalėjau patikrinti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Negalėjau atidaryti bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Negalėjau atidaryti laikinos pašto bylos: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Negalėjau uždaryti šaltinio aplanko %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Negalėjau uždaryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negalėjau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nežinoma klaida: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nepavyko išsaugoti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Klaida rašant į laikiną pašto dėžutę: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nepavyko rašyti į laikiną pašto dėžutę: %s: %s"
@@ -10444,10 +10535,17 @@ msgstr "Laiško įterpimas į MH atšauktas"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Negalėjau sukurti aplanko: „%s“:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "„%s“ nėra katalogas."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Negalėjau gauti aplanko „%s“: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10469,6 +10567,29 @@ msgstr "Konteineris „%s“ nėra įprasta byla ar katalogas"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Nėra tokio aplanko „%s/%s“."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Negalėjau atidaryti aplanko „%s“:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Nėra tokio aplanko „%s“."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Negalėjau sukurti aplanko: „%s“:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10697,46 +10818,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Jungimosi klaida: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nėra tokio aplanko: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nepavyko gauti grupės: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komandos klaida: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Ieškoma naujų laiškų"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nežinomas serverio atsakymas: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Naudoti atšaukimą"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacijos klaida: %s"
@@ -10783,7 +10904,7 @@ msgstr "Ištrinti po %s dienos(ų)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Atjungti visų POP3 išplėtimų palaikimą"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10873,7 +10994,7 @@ msgid "No such folder `%s'."
 msgstr "Nėra tokio aplanko „%s“."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10926,7 +11047,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pašto siuntimas per sendmail programą"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11093,7 +11214,7 @@ msgstr "SMTP pašto siuntimas per %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Negaliu siųsti laiško: siuntėjo adresas neteisingas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Siunčiamas laiškas"
 
@@ -11200,34 +11321,34 @@ msgstr "Baigėsi QUIT užklausos laiko riba: %s"
 msgid "QUIT response error"
 msgstr "QUIT atsakymo klaida"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Pašalinti pažymėtus elementus iš priedų sąrašo"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Prisegti priedą..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Prisegti bylą prie šio laiško"
 
@@ -11345,14 +11466,14 @@ msgstr "Spausk čia, kad pasirinktum aplanką"
 msgid "Attach file(s)"
 msgstr "Prisegti bylą(as)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11360,7 +11481,7 @@ msgstr ""
 "Negalima užkoduoti išsiunčiamo laiško: Nenustatytas šios sąskaitos kodavimo "
 "sertifikatas"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11369,30 +11490,30 @@ msgstr ""
 "Klaida skaitant bylą %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, užrašyti?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida išsaugant bylą: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida įkeliant bylą: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti laiško iš redaktoriaus"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11401,7 +11522,7 @@ msgstr ""
 "Paieška byloje nepavyko: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11410,7 +11531,7 @@ msgstr ""
 "Nepavyko sumažinti bylos: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11419,7 +11540,7 @@ msgstr ""
 "Nepavyko nukopijuoti bylos rodiklio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11428,7 +11549,7 @@ msgstr ""
 "Klaida automatiškai išsaugant laišką: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11436,7 +11557,7 @@ msgstr ""
 "Ximian Evolution rado neišsaugotų laiškų iš praeitos sesijos.\n"
 "Ar norėtumėte pabandyti juos atkurti?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11447,23 +11568,23 @@ msgstr ""
 "\n"
 "Ar norėtumėte jį išsaugoti?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Įspėjimas: Pakeistas laiškas"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Atidaryti bylą"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Parašas:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Autogeneruotas"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -11471,20 +11592,20 @@ 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:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Paslėpti _Priedų Juosta (meskite priedus čia)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Rodyti _Priedų Juostą (meskite priedus čia)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Sukurti laišką"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11492,7 +11613,7 @@ msgstr ""
 "Nepavyko sukurti laiškų rašymo lango:\n"
 "Nepavyko aktyvuoti adresų pasirinkimo valdymo."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11504,7 +11625,7 @@ msgstr ""
 "Įsitikinkite, kad pas Jus įdiegtos tinkamos gtkhtml bei\n"
 "libgtkhtml versijos.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11512,7 +11633,7 @@ msgstr ""
 "Negalėjau sukurti rašyklės lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11860,7 +11981,7 @@ msgstr "Tada"
 msgid "You must specify a folder."
 msgstr "Jūs turite nurodyti aplanką."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Pasirink aplanką"
@@ -11875,19 +11996,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Svarbus"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Darbai"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Vėliau"
 
@@ -11975,7 +12096,7 @@ msgstr ""
 "Laiško data filtravimo metu bus palyginta su \n"
 "dabar esančiu laiku."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtualūs aplankai"
 
@@ -11991,7 +12112,7 @@ msgstr " "
 msgid "months"
 msgstr "mėnesių"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekundžių"
 
@@ -12161,7 +12282,7 @@ msgstr "nėra pažymėtas"
 msgid "Junk Test"
 msgstr "Birželis"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Užrašas"
@@ -12269,9 +12390,10 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdymą"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Tema"
 
@@ -12279,25 +12401,25 @@ msgstr "Tema"
 msgid "Unset Status"
 msgstr "Atšaukti Būseną"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Taisyklė vardu „%s“ jau yra. Pasirinkite kitą vardą."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Taisyklės"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Pridėti taisyklę"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Keisti taisyklę"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Taisyklės pavadinimas"
 
@@ -12337,15 +12459,15 @@ msgstr "Temoje yra"
 msgid "Subject does not contain"
 msgstr "Temoje nėra"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Jūs turite įvardinti ši virtualų aplanką."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tu turi nurodyti bent vieną aplanką kaip šaltinį"
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "VFolder išeities tekstas"
 
@@ -12398,9 +12520,9 @@ msgstr "Evolution Pašto aplanko vaizduoklė"
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Paštas"
 
@@ -12408,7 +12530,7 @@ msgstr "Paštas"
 msgid "Mail Accounts"
 msgstr "Pašto Sąskaitos"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Pašto Nustatymai"
 
@@ -12446,15 +12568,15 @@ msgstr "Jūs turite nurodyti tinkamą scenarijaus vardą."
 msgid "[script]"
 msgstr "[scenarijus]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Kalba(os)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Pridėti parašo scenarijų"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Parašas(ai)"
 
@@ -12539,7 +12661,6 @@ msgid "Unread messages"
 msgstr "Neskaitytos žinutės"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<spausk čia, kad pasirinktum aplanką>"
 
@@ -12547,293 +12668,311 @@ msgstr "<spausk čia, kad pasirinktum aplanką>"
 msgid "Create New Folder"
 msgstr "Sukurti Naują Aplanką"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Šiame Kompiuteryje"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Gauti laiškai"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Įkeliama..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Pasirink aplanką"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Sukurti aplanką"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nepavyko ištrinti aplanko: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Ar tikrai norite ištrinti aplanką „%s“ ir visus su juo susijusius aplankus?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ištrinti \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Pervadinti Aplanką"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Jau yra aplankas pavadintas „%s“. Pasirinkite kitą vardą."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Atidaryti _Naujame Lange"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Perkelti"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Naujas Aplankas..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Savybės..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip naują laišką..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Tęsinys..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Pažymėti Bai_gtu"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Atša_ukti Pažymėjimą"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Pažymėti s_kaitytu"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Pažymėti _Neskaitytu"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Pažymėti Nes_varbiu"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Pažymėti kaip _Šiukšlę"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Atšaukti Šiukšlės _Pažymėjimą"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti į Aplanką..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Įtraukti Siuntėją į Adresų _Knygą"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Pritaik_yti Filtrus"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Sukur_ti Filtrą pagal Laišką"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Temą"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntėją"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gavėjus"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferenciją"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "vAplankas pagal Tąsą"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_emą"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_untėją"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_vėjus"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferenciją"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtras pagal Tąsą"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Įprastas"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Kopijuoti Nuorodą"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Paspauskite, kad išsiųsti %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Atitinka: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Nepasirašytas"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Tvarkingas parašas"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Netvarkingas parašas"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12841,11 +12980,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:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Parašas tvarkingas, negalima patikrinti siuntėjo"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12853,11 +12992,11 @@ msgstr ""
 "Laiškas pasirašytas su tvarkingu parašu, bet siuntėjas negali būti "
 "patikrintas."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Nekoduotas"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12865,11 +13004,11 @@ msgstr ""
 "Šis laiškas nėra koduotas. Jo turinys galėjo būti perskaitytas siuntimo "
 "tinkle metu."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Silpnai koduotas"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12878,11 +13017,11 @@ 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Koduotas"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12890,11 +13029,11 @@ msgstr ""
 "Šis laiškas yra užkoduotas. Įsilaužėliui būtų sunku perskaityti laiško "
 "turinį."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Smarkiai užkoduotas"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12904,37 +13043,37 @@ msgstr ""
 "Įsilaužėliui yra labai sunku atkoduoti tokį laišką naudojant šiuo metu "
 "prieinamas priemones."
 
-#: mail/em-format-html-display.c:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Peržiūrėti Sertifikatą"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio sertifikato"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Praleistos užduotys:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Žiūrėti Kontekste"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Slėpti"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Puslapis %d iš %d"
@@ -12977,29 +13116,34 @@ msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
 msgid "Formatting message"
 msgstr "Laiškas formatuojamas"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Nuo"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Pašto programa"
 
@@ -13013,8 +13157,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13031,19 +13175,24 @@ msgstr "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Nepalaikomas parašo formatas"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nežinoma klaida tikrinant parašą"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Nežinoma klaida tikrinant parašą"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (vidinis)"
 
@@ -13059,56 +13208,56 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nepavyko perkelti pop3 uid podėlių: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Nepavyko perkelti pop3 uid podėlių: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nepavyko sukurti katalogo „%s“: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nepavyko atverti saugyklos, skirtos „%s“: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Išsaugoti kaip..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neįvardintas_paveikslėlis.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Nustatyti kaip _foną"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "Atverti Nu_orodą Naršyklėje"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Siųsti laišką _kitam..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "Įtraukti į Adresų Knygą"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
@@ -13156,17 +13305,17 @@ msgstr "Filtrai"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas Laiškas --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13175,7 +13324,7 @@ msgstr ""
 "Negalima saugoti į „%s“\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13184,29 +13333,35 @@ msgstr ""
 "`%s' jau yra.\n"
 "Perrašyti?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "laiškas"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Klaida: „%s“ egzistuoja, tačiau nėra standartinė byla"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Išsaugoti Laišką..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Išsaugoti adresą"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Laiškai nuo %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Negalėjau sukurti laikino katalogo: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13220,7 +13375,7 @@ msgstr ""
 "\n"
 "Ar tikrai ištrinti šiuos laiškus?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13246,82 +13401,95 @@ 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
-#, fuzzy
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Tikrinti ateinančius laiškus dėl galimų šiukšlių"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Citatų išskyrimo spalva"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Citatų išskyrimo spalva."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Koduotė, kuri yra naudojama kuriant laiškus"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Koduotė, kuri yra naudojama kuriant laiškus."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Koduotė, kuri yra naudojama skaitant laiškus"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Koduotė, kuri yra naudojama skaitant laiškus"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Įprastas persiuntimo stilius"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Įprasta laiško tema."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Įprasta laiško tema."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Įprastas atsakymų stilius"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Įprastas aplankų juostos plotis"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Įprastas aplankų juostos plotis"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Rodyti rašymo klaidas laiško kūrimo metu."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Ištuštinti šiukšlių aplankus išeinant"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Išvalyti visus šiukšlių aplankus išeinant iš Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Įjungti žymeklio režimą, kad skaitant laišką būtų galima matyti žymeklį."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Perjungia žymeklio režimą"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Laiškų sąrašo skydelio aukštis"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Laiškų sąrašo skydelio aukštis."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13331,15 +13499,15 @@ msgstr ""
 "peržiūrėti gali būti naudojamas įprastas bonobo komponentas, susietas su "
 "atitinkamu tipu tarp GNOME mime tipų bazės."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Žymių ir su jomis susijusių spalvų sąrašas"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Sąskaitų sąrašas"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13347,11 +13515,11 @@ 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 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:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13359,15 +13527,15 @@ 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:28
+#: mail/evolution-mail.schemas.in.in.h:31
 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:29
+#: mail/evolution-mail.schemas.in.in.h:32
 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:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13377,80 +13545,80 @@ 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Registruoti filtro veiksmus"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Registruoti filtrų veiksmus į nurodytą žurnalo bylą."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Byla registruojanti filtrų veiksmus"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Byla registruojanti filtrų veiksmus."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Pažymėti kaip perskaityta po nurodyto laiko tarpo"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Pažymėti kaip Perskaityta po nurodyto laiko tarpo."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 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:38
+#: mail/evolution-mail.schemas.in.in.h:41
 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:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 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:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Naujo Pašto Perspėjimų garso byla"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Perspėjimų apie Naują Paštą tipas"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Užklausti, kai tema nenurodyta"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 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:46
+#: mail/evolution-mail.schemas.in.in.h:49
 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:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Įspėti vartotoją išvalymo metu"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 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:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13458,100 +13626,94 @@ 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 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:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Atpažinti nuorodas tekste ir jas pakeisti."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 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:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Tikrinti ateinantį paštą dėl galimų šiukšlių"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S14pt4 nu0st4t4"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S14pt4 nu0st4t4."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Paprastai siųsti laiškus HTML formatu"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Paprastai siųsti laiškus HTML formatu."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Įjungti Animacijas"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Leisti judėti prikabintiems animuotiems paveikslėliams."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Rodyti ištrintus laiškus (su perbraukimu) tarp laiškų sąrašo."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Rodyti ištrintus laiškus laiškų sąraše"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Naudoti „Peržiūros“ skyrių"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Naudoti „Peržiūros“ skyrių."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Groti garsus, kai pasirodo nauji laiškai."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Nurodo, kokį perspėjimo apie naujus laiškus tipą vartotojas norėtų naudoti."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Rašybą tikrinti rašymo metu"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Terminalo šriftas"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Pašto išvedime naudojamas terminalo šriftas"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Pašto išvedime naudojamas kintamo pločio šriftas"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13562,99 +13724,99 @@ msgstr ""
 "išvedimo principus. XML struktūros formatas yra &lt;antraštė enabled&gt; - "
 "nustatykite enabled, jei antraštė turi būti išvedama peržiūrint laišką."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Gijomis suskirstytas laiškų sąrašas."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Gijomis suskirstytas laiškų sąrašas"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Kurti laiškų sąrašo gijas remiantis laiškų temomis"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Įprastos sąskaitos UID seka."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Naudoti Spamassasin demoną ir klientą"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Naudoti Spamassassin demoną ir klientą (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Naudoti savo šriftus"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Naudoti specialius šriftus rodant laiškus"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Kintamo pločio šriftas"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Rodyti/Bcc punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Rodyti/Bcc meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Rodyti/Cc meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Rodyti/Cc meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Rodyti/Nuo meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Rodyti/Nuo meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Rodyti/SkirtasKam meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Rodyti/SkirtasKam meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Rodyti/AtsakytiKam meniu punktas yra įjungtas"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Rodyti/AtsakytiKam meniu punktas yra įjungtas."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13662,70 +13824,67 @@ msgstr ""
 "Ar naudoti gijų rūšiavimą pagal antraštes, jei laiškai neturi In-Reply-To "
 "arba Reference antraščių."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importuoti"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importavimo priemonė"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importavimo priemonė"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo seną Elm paštą"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importuojama..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prašome palaukti"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importuojama %s kaip %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Skanuojama %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importuojamos bylos"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13733,16 +13892,44 @@ msgstr ""
 "Evolution rado Elm pašto bylų\n"
 "Ar norėtum jas importuoti į Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Juodraščių _aplankas:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importuojama"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importuojamos bylos"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Skanuojama %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetų  Filtras „%s“"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13768,7 +13955,7 @@ msgstr ""
 "dirba\n"
 "taip, kaip numatyta."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13780,7 +13967,7 @@ msgstr ""
 "kurios yra nepalaikomos Evolution.\n"
 "Šie filtrai nebus įkelti."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13793,31 +13980,24 @@ msgstr ""
 "bus pakeisti taip, kad tikrintų ar pateikta simbolių seka yra\n"
 "tarp laiško."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Ieškoma pašto filtrų"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Skanuojamas katalogas"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Pradedama importuoti"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Pašto Filtrai"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13825,11 +14005,20 @@ msgstr ""
 "Evolution rado Netscape pašto bylų.\n"
 "Ar norėtum jas importuoti į Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuoja tavo senus Pine duomenis"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importuojamos bylos"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adresų knygelė"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13837,7 +14026,7 @@ msgstr ""
 "Evolution rado Pine pašto bylų.\n"
 "Ar norėtum jas importuoti į Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13880,19 +14069,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Tu neįvedei visos būtinos informacijos."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution sąskaitų tvarkyklė"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Vartotojo _vardas:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Kelias:"
 
@@ -13944,27 +14133,42 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Naujas pašto laiškas"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Pašto laiškas"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Rašyti naują laišką"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Naujas vAplankas"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Pašto Filtrai"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Sukurti naują kalendorių"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Asmenybė"
 
@@ -14008,7 +14212,7 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Sąskaitos tvarkymas"
 
@@ -14034,118 +14238,114 @@ msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL yra nepalaikomas šiame Evolution variante)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL yra nepalaikomas šiame Evolution variante)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>Išve_damos Pašto Antraštės</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Siunči_ant koduotus laiškus koduoti juos ir sau"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Sąskaitų Tvarkyklė"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Sąskaitos informacija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "P_ridėti Scenarijų"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Pridėti naują parašą..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Visada koduoti laiškus sau, kai jie yra siunčiami koduoti"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Visada siųsti slaptą kopiją (_Bcc) adresu:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Visada siųsti kopija (_Cc) adresu:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Visada koduojant pasi_tikėti raktais tarp turimo raktų rinkinio"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Pridėti originalų laišką"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Koduotė:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "Spalv_os"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Pat_ikrinti Gautą Paštą"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "_Tikrinti žinučių rašybą rašymo metu"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Tikrinti gaunamus laiškus dėl galimų šiukšlių"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "_Klaidingų žodžių spalva:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Laiškų Kūrimas"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfigūravimas"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14160,277 +14360,273 @@ msgstr ""
 "\n"
 "Paspauskite „Baigti“, kad išsaugotumėte Jūsų nustatymus."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Įprasta Elgsena"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Įprasta simbolių _koduotė:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Laiškų Trynimas"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Vi_sada skaitmeniniu būdu pasirašyti siunčiamus laiškus"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Necituoti pradinio laiško"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Nepasirašyti susitiki_mų užklausimų (dėl suderinamumo su Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Juodraščių _aplankas:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Pašto Sąskaitos"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "El. pašto _adresas:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Iš_tuštinti šiukšlių aplankus išeinant"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Kodavimo sertifikatas:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution sąskaitų padėjėjas"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Paleisti Komandą..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fi_ksuotas-plotis:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Filtrų Nuostatos"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Šrifto Savybės"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Rašyti laišką _HTML formatu"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Antraštės"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Paryškinti _citatas su "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Viduje"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Žymės ir Spalvos"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Paveikslėlių Įkėlimas"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Pašto nustatymas"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Pašto dėžutės vieta"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Laiškų Rašymas"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Laiškų Peržiūra"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Naudojami Šriftai"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Naujų Laiškų Perspėjimai"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Pastaba: Jungiantis pirmą kartą Jus paprašys įvesti slaptažodį"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Nebūtina informacija"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG Ra_kto ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pasirink spalvą"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Spausdinami Šriftai"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Cituoti originalų laišką"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Prisi_minti šį slaptažodį"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "A_tsakyti-Kam:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Pašto gavimas"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Gavimo Nu_ostatos"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Prisiminti šį slaptažodį"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Būtina informacija"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Atstatyti Įprastą"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_augumas"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Saugus MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Pasirinkti HTML fiksuoto pločio šriftą"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Pasirinkti HTML fiksuoti pločio šriftą naudojamą spausdinant"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Pasirinkti HTML kintamo pločio šriftą"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Pasirinkti HTML kintamo pločio šriftą spausdinimui"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Pašto siuntimas"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Išsiųstų _laiškų aplankas:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Išsiųsti laiškai ir juodraščiai"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Parašo sertifikatas:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Nurodyti _bylą:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Rašybos _Tikrinimas"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standartinė Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14440,7 +14636,7 @@ msgstr ""
 "parašas. Nurodytas vardas bus naudojamas tik atvaizdavimo\n"
 "tikslais. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14449,7 +14645,7 @@ msgstr ""
 "Šis puslapis leidžia Jums nustatyti rašybos tikrinimo elgseną ir kalbą. "
 "Pateiktas kalbų sąrašas galioja tik toms kalboms, kurių žodynai yra įdiegti."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14457,15 +14653,15 @@ msgstr ""
 "Pasirinkite pavadinimą, kuriuo norėtumėte vadinti šią sąskaitą.\n"
 "Pavyzdžiui, „Darbas“ ar „Asmeninė“."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Naudoti _Tarnybą"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Kint_amas-plotis:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14475,173 +14671,173 @@ msgstr ""
 "\n"
 "Spausk „Tolyn“, kad pradėtumėte. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Pridėti Parašą"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Vis_ada įkelti paveikslėlius iš tinklo"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Visad_a pasirašyti siunčiamus laiškus, kai naudojama ši sąskaita"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentifikacijos tipas: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Automatiškai tikrinti paštą kas"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatiškai įterpti šypsiukų paveikslėlius"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Įspėti gavus naują laišką"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Patvirtinti kai išvalomas aplankas"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Įprastas _parašas:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Įprastos reikšmės"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neinformuoti apie naujų laiškų atsiradimą"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Įjungti"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Visada koduoti išsiunčiamus laiškus"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Pe_rsiuntimo stilius:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML Paštas"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Asmenybė"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Šiukšlės"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "Įke_lti paveikslėlius, jei siuntėjas yra adresų knygoje"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "_Tik Vietiniai Testai"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Padaryti šią sąskaitą įprastine"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Pažy_mėti laiškus skaitytais po"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Niekada neįkelti paveikslėlių iš tinklo"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Groti garsus, kai pasirodo nauji laiškai"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Paklausti, kai siunčiamas HTML laiškas adresatams, kurie nenori gauti HTML "
 "laiškų"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prieš siunčiant laiškus nenurodžius _temos"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Pašto Gavimas"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Atsakymų stilius:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Atstatyti įp_rastas reikšmes"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Scenarijus:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "Pa_srinkite..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Siunčiamas Paštas"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Rodyti judančius paveik_slėlius"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Parašai"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Įpra_stas Šriftas"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminalo Šriftas"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Na_udoti saugią jungtį (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Na_udoti sisteminius šriftų nustatymus"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "aprašymas"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Tikrinamas %s"
@@ -14664,7 +14860,7 @@ msgstr ""
 "Klaida vykdant veiksmą:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Dirbama"
 
@@ -14676,12 +14872,12 @@ msgstr "Filtruojamas aplankas"
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko pritaikyti išeinančių filtrų: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14690,116 +14886,116 @@ msgstr ""
 "Nepavyko įterpti į %s: %s\n"
 "Įterpiama į vietinį „Išsiųstų laiškų“ aplanką."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siunčiamas „%s“"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siunčiamas laiškas %d iš %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nesėkmė ties laišku %d iš %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Laiškas išsaugomas į aplanką"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys „%s“"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Išvalomas aplankas"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Išvaloma šiukšlinė tarp „%s“"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Vietiniai Aplankai"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiškas %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d laiškai"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Išsaugomi %d laiškai"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14808,7 +15004,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14817,11 +15013,11 @@ msgstr ""
 "Klaida išsaugant laiškus į: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14830,22 +15026,22 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Keičiama šiukšlių žymė"
 
@@ -14877,38 +15073,38 @@ msgstr "Kriptografija"
 msgid "Security Information"
 msgstr "Saugumo Informacija"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kelias: %s, tipas: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Siunčiamas ir gaunamas paštas"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Atšaukti Visus?"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Laukiama..."
 
@@ -15017,20 +15213,20 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Keisti vAplanką"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojantį vAplanką '%s'."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
@@ -15347,97 +15543,20 @@ msgstr "Atsijungę Aplankai"
 msgid "Autocompletion Folders"
 msgstr "Užbaigimo Aplankai"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Nepavyko nukopijuoti aplanko: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Nepavyko perkelti aplanko: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Negalima aplanko perkelti į jį patį."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Negalima aplanko kopijuoti į jį patį."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Negalima perkelti aplanko į vieną iš jo palikuonių."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Nurodyk aplanką, į kurį kopijuoti aplanką \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopijuoti Aplanką"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Nurodyk aplanką, į kurį perkelti aplanką \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Perkelti Aplanką"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Negalėjau ištrinti aplanko:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Ar tikrai norite ištrinti aplanką „%s“?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Negalėjau pervadinti aplanko:\n"
+"Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Nurodytas aplanko vardas yra negalimas: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Pasirinktas aplankas nepriklauso kitam vartotojui"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nepavyko pašalinti aplanko:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Negaliu sukurti nurodyto aplanko:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bevardis)"
@@ -15577,7 +15696,7 @@ msgstr "Nepavyko paleisti gpg programos."
 msgid "_Import"
 msgstr "_Importuoti"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Uždaromos jungtys..."
 
@@ -15615,6 +15734,10 @@ msgstr "Nepavyko atverti bendrinio aplanko: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nepavyko rasti nurodyti bendrinio aplanko."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Pradedama importuoti"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15730,123 +15853,6 @@ msgstr "Konfigūracijos duombazė nerasta"
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Sukurti naują nuorodų grupę"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Grupės pavadinimas:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Ar Jūs tikrai norite pašalinti grupę „%s“ iš trumpių juostos?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Pervadinti trumpių grupę"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Pervadinti pasirinktą trumpių grupę į:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Mažos ikonos"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Rodyti trumpes kaip mažas ikonas"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Didelės ikonos"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Rodyti trumpes kaip dideles ikonas"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Pridėti Grupę..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Sukurti naują trumpių grupę"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Pašalinti šią grupę..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Pašalinti šią trumpių grupę"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Pervadinti šią grupę..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Pervadinti šią trumpių grupę"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Paslėpti trumpių juostą"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Paslėpti trumpių juostą"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Sukurti Stan_dartinius Trumpius"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Sukurti Standartinius Trumpius"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Pervardinti Trumpį"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Pervadinti pasirinktą trumpę į:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Atidaryti aplanką, susietą su šia trumpe"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Atidaryti naujame _lange"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Atidaryti aplanką susietą su šiuo trumpiu naujame lange"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Pervadinti šią trumpę"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Iš_trinti"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Pašalinti šią trumpę iš trumpių juostos"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Klaida išsaugant trumpes."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Trumpės"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Pasirinkimo laukas"
@@ -15857,11 +15863,6 @@ msgstr "Pasirinkimo laukas"
 msgid "New"
 msgstr "Nauja"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "„%s“ tarp „%s“"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16158,45 +16159,45 @@ msgstr ""
 "%s: --online ir --offline negali būti naudojami tuo pačiu metu.\n"
 "  Naudokite %s --help norėdami gauti daugiau informacijos.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Pasirinkti įkeliamą sertifikatą..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Sertifikato Vardas"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Paskirtis"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Serijinis Numeris"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Galiojimo pabaiga"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatų žiūryklė: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Įveskite „%s“ slaptažodį"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16205,7 +16206,7 @@ msgstr ""
 "Skirtas:\n"
 "  Tema: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16270,7 +16271,7 @@ msgstr ""
 "Prieš sukurdami pasitikėjimą šiuo CA, Jūs turėtumėte patikrinti sertifikatą, "
 "jo taisykles ir procedūras (jei įmanoma)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Sertifikatas"
 
@@ -16335,11 +16336,11 @@ msgstr "Organizacinis Vienetas (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Požymis"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL Klientinis Sertifikatas"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL Serverio Sertifikatas"
 
@@ -16384,209 +16385,209 @@ msgstr "Jūsų sertifikatų byla saugo šių asmenų sertifikatus:"
 msgid "Your Certificates"
 msgstr "Jūsų Sertifikatai"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Toks sertifikatas jau yra"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y %m %d"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Versija"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "1-a versija"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "2-a versija"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "3-a versija"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 su RSA kodavimu"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 su RSA kodavimu"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 su RSA kodavimu"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA kodavimas"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Sertifikato Rakto Naudojimas"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Netscape Sertifikato Tipas"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifikatoriaus Autorizacinio Rakto Identifikatorius"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekto Identifikatorius (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Algoritmo Identifikatorius"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Algoritmo Parametrai"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Antraštės Viešo Rakto Info"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Antraštės Viešo Rakto Algoritmas"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Antraštės Viešas Raktas"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Klaida: Nepavyko apdoroti išplėtimo"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Objekto Pasirašytojas"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "SSL Sertifikatų Autorizatorius"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Pašto Sertifikatų Autorizatorius"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Pasirašoma"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "Ne dalyvis"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Rakto Koduotė"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Duomenų Koduotė"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Rakto Sutartis"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Sertifikato Pasirašytojas"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "CRL Pasirašytojas"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Kritinis"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Nekritinis"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Išplėtimai"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikato Parašo Algoritmas"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Leidėjas"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "Unikalus Leidėjo ID"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "Unikalus Temos ID"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Sertifikato Parašo Vertė"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Bylos Slaptažodis"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Įveskite PKCS12 bylos slaptažodį:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Įkeltas Sertifikatas"
 
@@ -17173,7 +17174,8 @@ msgid "_Threaded Message List"
 msgstr "_Gijomis suskirstytas laiškų sąrašas"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Į_traukti Siuntėją į Adresų Knygą"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17181,7 +17183,8 @@ msgid "A_pply Filters"
 msgstr "_Pritaikyti Filtrus"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Įtraukti Siuntėją į Adresų Knygą"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17626,10 +17629,6 @@ msgstr "For_matas"
 msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Atidaryti"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Atidaryti bylą"
@@ -17991,22 +17990,6 @@ msgstr "_Siųsti / Gauti"
 msgid "_Window"
 msgstr "_Langas"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Spausdinti apžvalgą"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Spausdinti apžvalgą"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Iš naujo įkelti"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Iš naujo įkelti rodinį"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Pagal _kompaniją"
@@ -18067,8 +18050,8 @@ msgstr "Su _Kategorija"
 msgid "_Tasks"
 msgstr "_Užduotys"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18310,23 +18293,23 @@ msgstr "_Ieškoti"
 msgid "_Find Now"
 msgstr "_Surasti"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "Iš_valyti"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Elemento ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Antrinio elemento ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Tekstas"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "_Surasti"
 
@@ -18340,6 +18323,211 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 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"
+#~ msgstr ""
+#~ "Negalėjau atidaryti bylos „%s“: \n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepavyko sukurti katalogo „%s“:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negalėjau sukurti bylos „%s“:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "„%s“ nėra katalogas."
+
+#~ msgid "On this Computer"
+#~ msgstr "Šiame Kompiuteryje"
+
+#, fuzzy
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Tikrinti ateinančius laiškus dėl galimų šiukšlių"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importuojama %s kaip %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Ieškoma pašto filtrų"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Skanuojamas katalogas"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Nepavyko nukopijuoti aplanko: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Nepavyko perkelti aplanko: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Negalima aplanko perkelti į jį patį."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Negalima aplanko kopijuoti į jį patį."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Negalima perkelti aplanko į vieną iš jo palikuonių."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Nurodyk aplanką, į kurį kopijuoti aplanką \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopijuoti Aplanką"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Nurodyk aplanką, į kurį perkelti aplanką \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Perkelti Aplanką"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negalėjau ištrinti aplanko:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Ar tikrai norite ištrinti aplanką „%s“?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negalėjau pervadinti aplanko:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Pasirinktas aplankas nepriklauso kitam vartotojui"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepavyko pašalinti aplanko:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Sukurti naują nuorodų grupę"
+
+#~ msgid "Group name:"
+#~ msgstr "Grupės pavadinimas:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Ar Jūs tikrai norite pašalinti grupę „%s“ iš trumpių juostos?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Pervadinti trumpių grupę"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Pervadinti pasirinktą trumpių grupę į:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Mažos ikonos"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Rodyti trumpes kaip mažas ikonas"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Didelės ikonos"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Rodyti trumpes kaip dideles ikonas"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Pridėti Grupę..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Sukurti naują trumpių grupę"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Pašalinti šią grupę..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Pašalinti šią trumpių grupę"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Pervadinti šią grupę..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Pervadinti šią trumpių grupę"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Paslėpti trumpių juostą"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Paslėpti trumpių juostą"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Sukurti Stan_dartinius Trumpius"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Sukurti Standartinius Trumpius"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Pervardinti Trumpį"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Pervadinti pasirinktą trumpę į:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Atidaryti aplanką, susietą su šia trumpe"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Atidaryti naujame _lange"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Atidaryti aplanką susietą su šiuo trumpiu naujame lange"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Pervadinti šią trumpę"
+
+#~ msgid "Re_move"
+#~ msgstr "Iš_trinti"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Pašalinti šią trumpę iš trumpių juostos"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Klaida išsaugant trumpes."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Trumpės"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "„%s“ tarp „%s“"
+
+#~ msgid "Print Summary"
+#~ msgstr "Spausdinti apžvalgą"
+
+#~ msgid "Print summary"
+#~ msgstr "Spausdinti apžvalgą"
+
+#~ msgid "Reload"
+#~ msgstr "Iš naujo įkelti"
+
+#~ msgid "Reload the view"
+#~ msgstr "Iš naujo įkelti rodinį"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopijuoti į aplanką..."
 
diff --git a/po/lv.po b/po/lv.po
index ae5edbd9ae..0fe2000613 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -50,8 +50,7 @@ msgstr "Šeit konfigurējiet jūsu epasta kontus"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -99,20 +98,20 @@ msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Adrešu grāmata"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -120,67 +119,67 @@ msgstr "Adrešu grāmata"
 msgid "Delete"
 msgstr "Dzēst"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Jauns kontakts:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Izveidot jaunu kontaktu"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Jauns kontaktu saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktu saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Izveidot jaunu kontaktu sarakstu"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Nespēju savienoties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nespēju autentificēties ar LDAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Nevarēju izpildīt pieprasījumu uz saknes DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Kļūda saņemot shēmas informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Gaidu..."
@@ -194,42 +193,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Ehotestējam %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personīgi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Autoaizpildes mapes"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -241,7 +242,7 @@ msgstr ""
 "Lūdzu padariet jūsu meklējumu precīzāku vai arī paliliniet rezultāta limitu\n"
 "direktorijas servera preferencēs šai adrešu grāmatai."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -253,19 +254,19 @@ msgstr ""
 "vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
 "šajai adrešu grāmatai."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -274,7 +275,7 @@ msgstr ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir pieejas atļauja ceļa mērķim."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -284,7 +285,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -296,7 +297,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "programmatūras iegūšanas no saites zemāk.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -306,28 +307,33 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Nevaru atvērt adrešu gramatu"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Izmantoju LDAP serveri anonīmi"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Neizdevās autentificēties.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIevadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, ko kalendārs parādīs"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, ko kalendārs parādīs"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -371,7 +377,7 @@ msgstr "  Pa_rādīt atbalstītās bāzes"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -404,20 +410,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Adrešu grāmatas uzstādījumi"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Adrešu grāmatas resursi"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adrešu grāmatas resursi"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adrešu grāmatas avoti..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Vienmēr"
 
@@ -428,7 +435,8 @@ msgstr "Anonīmi"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -438,52 +446,52 @@ msgstr ""
 "Lūdzu klikšķiniet uz \"Beigt\" pogas, lai saglabātu jūsu tikko ievadītos "
 "uzstādījumus."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Savienojos"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Beigt"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Grupa"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nekad"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -499,23 +507,23 @@ msgstr ""
 "jūsu savienojumu. Paprasiet savam sistēmu administrātoram, vai jūsu LDAP "
 "serveris lieto tos protokolus."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Viens"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "M_eklēšanas mērogs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Meklēšana"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Izvēlētais:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -524,7 +532,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -541,7 +549,7 @@ msgstr ""
 "savienojums jau\n"
 "ir drošs."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -555,7 +563,7 @@ msgstr ""
 "drošības\n"
 "kļūdu izmantojumiem."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -566,44 +574,45 @@ msgstr ""
 "uzstādījumus LDAP\n"
 "meklējumiem, un konaktu izveidošanai un rediģēšanai."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Parādāmā nosaukuma norādīšana ir pēdējais pieprasītais solis LDAP servera "
 "konfigurēšanā."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Solis 1: Servera informācija"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Solis 2: Savienojamies ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Solis 3: Meklēšana direktorijā"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Apakš"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -616,7 +625,7 @@ msgstr ""
 "sistēmu\n"
 "administrātoram, vai jums ir vajadzība mainīt šīs opcijas."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -627,7 +636,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -642,12 +651,13 @@ 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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -658,24 +668,25 @@ msgstr ""
 "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."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Šis ir maksimālais lejupielādējāmo ierakstu skaits. Uzstādot šo skaitli "
 "pārlieku \n"
 "lielu, tiks bremzēta jūsu adrešu grāmatas darbība."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -685,7 +696,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -694,7 +705,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -704,7 +715,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:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -715,28 +726,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Izman_tot SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Izmantoju atšķirīgo vārdu (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Izmantoju epasta adresi"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kad iespējams"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -749,19 +760,19 @@ msgstr ""
 "informāciju. Lūdzu vaicājiet jūsu sistēmu administrātoram ja jūs nēsat "
 "pārliecināti par jūsu informāciju."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Attēlošanas nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -770,39 +781,39 @@ msgstr "_Lejupielādes limits:"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Pieteikšanās metode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Porta numurs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Taimouts (minūtes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -931,7 +942,7 @@ msgstr "Kolabrācija"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
@@ -1032,10 +1043,10 @@ msgstr "Ka_tegorijas..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1087,16 +1098,16 @@ msgid "_Web page address:"
 msgstr "_Web lapaspuses adrese:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "_Adrese:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2089,111 +2100,119 @@ msgid "AOL Instant Messenger"
 msgstr "_Publicēt vēstuli"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Nenosaukts saraksts"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Pasta vēstule"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Serviss kārtībā"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Lokācija: "
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Lietotājvārds:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Mājas"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Darbs"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Citi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Avots"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Jauns kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Čada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Konta nosaukums"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategoriju redaktors nav pieejams."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontakts pieder šādām kategorijām:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Saglabāt konaktu kā VKarti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2202,7 +2221,7 @@ msgstr ""
 "Vai jūs tiešām vēlaties\n"
 "dzēst šo kontaktu?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2210,49 +2229,54 @@ msgstr ""
 "Vai jūs tiešām vēlaties\n"
 "dzēst šo kontaktu?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Darījumi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Joro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nevar atrast logdaļu laukam: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakta ātrā pievienošana"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Rediģēt pilnīgi"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Pilns vārds:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2420,11 +2444,11 @@ msgid "Is New List"
 msgstr "Jauns saraksts"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktu saraksta redaktors"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Saglabāt Sarakstu kā VKarti"
 
@@ -2517,13 +2541,13 @@ msgid "Email begins with"
 msgstr "Epasts sākas ar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
@@ -2540,101 +2564,101 @@ msgid "Type"
 msgstr "Tips"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Adrešu grāmata"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Jauns kontakts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Jauns kontaktu saraksts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Iet uz mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Meklēt kontaktus..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adrešu grāmatas avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot uzstādījumi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Pārsūtīt kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Drukāt aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izgriezt"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopēt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Pašreizējais skats"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2647,8 +2671,8 @@ msgstr ""
 "izmantot"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Jebkura kategorija"
 
@@ -2691,7 +2715,7 @@ msgid "Company Phone"
 msgstr "Kompānijas telefons"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Epasts"
 
@@ -2753,7 +2777,7 @@ msgid "Nickname"
 msgstr "Iesauka"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Piezīme"
 
@@ -2762,7 +2786,7 @@ msgid "Office"
 msgstr "Birojs"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizācija"
 
@@ -2899,68 +2923,74 @@ msgstr "Izvēlētais:"
 msgid "Has Cursor"
 msgstr "Uzdevumu kārtošana"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Locekļi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-pasts"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Darbs"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Bostona"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponkē"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personīgi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Darba nosaukums:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Mājas fakss"
@@ -2970,8 +3000,8 @@ msgid "Success"
 msgstr "Veiksmīgi"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3003,7 +3033,7 @@ msgstr "Protokols nav atbalstīts"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3023,7 +3053,8 @@ msgid "TLS not Available"
 msgstr "TLS nav pieejams"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adrešu grāmata neeksistē"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3166,7 +3197,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Pievienot adresi eksistējošajam \"%s\" kontaktam"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Meklēju adrešu grāmatā..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3226,17 +3258,40 @@ msgstr "Autortiesības 1999, 2000, 2001 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evoluion importēšanas asistents"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Drukāt kontaktus"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Drukāt kontaktus"
@@ -3329,7 +3384,7 @@ msgstr "Robežas"
 msgid "Number of columns:"
 msgstr "Kolonu skaits:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcijas"
 
@@ -3512,8 +3567,8 @@ msgstr "Nav dots faila nosaukums."
 msgid "Unnamed List"
 msgstr "Nenosaukts saraksts"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Ievadiet paroli"
@@ -3600,10 +3655,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution Kopsavilkuma komponente."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Uzdevumi"
 
@@ -3648,26 +3702,24 @@ msgstr "Snaust kādu laiku (minūtes)"
 msgid "_Edit appointment"
 msgstr "R_ediģēt tikšanos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Atvērt"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Atvērt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3676,12 +3728,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3693,7 +3745,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3710,19 +3762,19 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Nevarēju inicializēt Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Nespēju inicializēt gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nevarēju izveidot trauksmes notifikācijas servisa ražotni"
 
@@ -3868,24 +3920,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Kopsavilkums satur"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Apraksts satur"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Apraksts satur"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Neatbilstoši"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendārs"
 
@@ -3918,7 +3976,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3940,78 +3998,78 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Jauna tikšanās"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Tikšanās"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Jauna tikšanās visu dienu"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Visas _dienas tikšanās"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendārs:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Izveidot jaunu mapi"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4151,7 +4209,7 @@ msgstr "stundas"
 msgid "minutes"
 msgstr "minūtes"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4225,7 +4283,7 @@ msgid "hour(s)"
 msgstr "stunda(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -4236,7 +4294,7 @@ msgstr "tikšanās sākums"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktivizēts"
 
@@ -4288,7 +4346,7 @@ msgstr "30 minūtes"
 msgid "60 minutes"
 msgstr "60 minūtes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Trauksmes"
 
@@ -4313,7 +4371,7 @@ msgid "Days"
 msgstr "Dienas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
@@ -4456,7 +4514,7 @@ msgid "_Fri"
 msgstr "_Piek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Galvenais"
 
@@ -4560,7 +4618,7 @@ msgstr ""
 "uzstādījumus."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Uzdevumu saraksts"
@@ -4740,23 +4798,23 @@ msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 msgid "Validation error: %s"
 msgstr "Validācijas kļūda: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " uz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Izpildīts "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Izpildīts"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Līdz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Līdz"
 
@@ -4792,8 +4850,8 @@ msgstr "Žurnāla ieraksts - %s"
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
@@ -4825,11 +4883,21 @@ msgstr "Atsaukt operāciju"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendārs"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Uzdevumu saraksts"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4944,7 +5012,7 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Tikšanās"
 
@@ -4968,23 +5036,31 @@ msgstr "Plānošana"
 msgid "Meeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Atļauja liegta"
@@ -5065,29 +5141,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nekas"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Nepieciešams organizētajs."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Tiek pieprasīts vismaz viens apmeklētājs."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Deleģēt uz..."
 
@@ -5286,7 +5362,7 @@ msgstr "uz"
 msgid "occurrences"
 msgstr "reizes"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Datums/laiks:"
@@ -5323,7 +5399,7 @@ msgid "_No recurrence"
 msgstr "Bez a_tkārtošanās"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Izņemt"
 
@@ -5366,7 +5442,7 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5391,7 +5467,7 @@ msgstr "Informācija par uzdevuma norīkojumu ir izveidota. Nosūtīt to?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Izpildīšanas datums ir nepareizs"
 
@@ -5404,7 +5480,7 @@ msgstr "% izpildīts"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Pabeigts"
 
@@ -5417,7 +5493,7 @@ msgstr "Augsts"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Progresā"
 
@@ -5436,7 +5512,7 @@ msgstr "Normāls"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nav iesākts"
 
@@ -5478,16 +5554,16 @@ msgstr "Pamata"
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Izpildes datums ir nepareizs"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nevaru atvērt adrešu gramatu"
@@ -5498,7 +5574,7 @@ msgstr "Konfidenciāli"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Apraksts:"
 
@@ -5692,11 +5768,10 @@ msgstr "Sākuma datums"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Kopsavilkums"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "krāsa"
 
@@ -5722,7 +5797,7 @@ msgstr "Z"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "A"
 
@@ -5757,10 +5832,10 @@ msgstr "Nē"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nezināms"
@@ -5773,99 +5848,105 @@ msgstr "Periodisks"
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Dzēšu izvēlētos objektus"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Jauna _tikšanās...."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Jauns visas di_enas notikums"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Drukāt..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Ievietot"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Iet uz _dienu"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Iet uz datumu..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicēt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Atvērt"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Saglabāt kā..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Plānot _sanāksmi..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Pārsūtīt kā iKalendāru..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Uzstādījumi..."
 
@@ -5953,7 +6034,7 @@ msgid "Alarms"
 msgstr "Trauksmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Izpildīts"
 
@@ -6011,26 +6092,26 @@ msgstr "%02i minūšu sadaļas"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6213,7 +6294,7 @@ msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
@@ -6673,12 +6754,12 @@ msgstr "_Prioritāte:"
 msgid "Web Page:"
 msgstr "Lapa"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6688,7 +6769,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6696,12 +6777,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6710,29 +6791,39 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Ielādēju attēlus"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Nav tikšanos"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atvērt ar %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6852,16 +6943,16 @@ msgstr "Brīvs/Aizņemts informācija (%s uz %s)"
 msgid "iCalendar information"
 msgstr "iKalendāra informācija"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6869,7 +6960,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6877,12 +6968,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7071,49 +7162,49 @@ msgstr "Izvēlētais mēnesis (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Uzdevums"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritāte: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procenti Izpidildīti: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorijas: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakti:"
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Drukāt Priekšmetu"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
@@ -7122,39 +7213,39 @@ msgstr "Drukāšanas Uzstādijumi"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7215,20 +7306,20 @@ msgstr "Kalendāra ziņojums"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Publiska mape, kas satur tikšanos un notikumu ierakstus"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Atgādinājums!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalendāra notikumi"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7236,7 +7327,7 @@ msgstr ""
 "Evolution ir atradis Gnome Kalendāra failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome kalendārs"
 
@@ -8900,7 +8991,7 @@ msgstr "Nevar atvērt vēstuli"
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
@@ -8986,7 +9077,7 @@ msgstr "Kopēju vēstules"
 msgid "Filtering new message(s)"
 msgstr "Saņemu %d vēstuli(es)"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8997,15 +9088,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Neizdevās noparsēt gpg userid padomu."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Neizdevās noparsēt gpg paroļfrāzes pieprasījumu."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9014,30 +9105,26 @@ msgstr ""
 "Jums nepieciešama atslēgfrāze, lai atslēgtu atslēgu\n"
 "lietotājam: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nav piegādāti dati"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 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:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9048,34 +9135,34 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Neizdevās GPG %s vēstuli: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Neizdevās palaist gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Neizdevās palaist gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9083,28 +9170,28 @@ 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indeksa ķermenis satur"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nespēju saņemt vēstuli no redaktora"
@@ -9216,21 +9303,34 @@ msgstr "Neizdevās atkodēt MIME daļu: nepareiza struktūra"
 msgid "parse error"
 msgstr "parsēšanas kļūda"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Virtuālās mapes epasta piegādātājs"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Pasta lasīšanai kā citas mapju kopas pieprasījumu"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nevarēju ielādet %s: Moduļu ielāde nav atbalstīta šajā sistēmā."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nevarēju ielādēt %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nevar ielādēt %s: Nav initicializācijas koda modulī."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Nav pieejams piegādātajs protokolam '%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonymous lietotājs"
@@ -9381,7 +9481,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -9517,20 +9617,7 @@ msgstr "Hosta meklēšana neizdevusies: hosts nav atrasts"
 msgid "Host lookup failed: unknown reason"
 msgstr "Hosta meklēšana neizdevusies: nezināms iemesls"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Virtuālās mapes epasta piegādātājs"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Pasta lasīšanai kā citas mapju kopas pieprasījumu"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Nav pieejams piegādātajs protokolam '%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9600,21 +9687,25 @@ msgstr "Serveris: %s, Tips: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevaru dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevaru izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Atkritummape"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9845,21 +9936,31 @@ msgstr "Nav tādas vēstules %s iekš %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Jūs nevarat kopēt vēstules uz atkritumu mapi."
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9876,16 +9977,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Attiecināt filtrus uz jaunām vēstulēm INBOX šajā serverī"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adrešu grāmata"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9905,42 +10001,40 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Parole"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Noklusētais"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Bieza dūmaka"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojās: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9949,26 +10043,26 @@ msgstr ""
 "Trauksme no IMAP servera %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Negaidīta atbilde no IMAP servera: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Servera atbilde beidzās pārāk ātri."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP servera atbilde nesaturēja %s informāciju"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Negaidīta OK atbilde no IMAP servera: %s"
@@ -9983,7 +10077,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mape tika iznīcināta un pārizveidota uz servera."
 
@@ -9992,12 +10086,12 @@ msgstr "Mape tika iznīcināta un pārizveidota uz servera."
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nespēju saņemt vēstuli: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10013,25 +10107,25 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Šī vēstule šobrīd nav pieejama"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 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:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nevarēju atrast vēstules ķermeni FETCH atbildē."
 
@@ -10091,27 +10185,37 @@ msgstr "Vārdalauks"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Attiecināt filtrus uz jaunām vēstulēm INBOX šajā serverī"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Pārbaudam jaunas vēstules visās mapēs"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Pārbaudam jaunas vēstules visās mapēs"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP serveris %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP serviss priekš %s uz %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10120,65 +10224,65 @@ msgstr "IMAP serviss priekš %s uz %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL sarunas neizdevušās"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10189,24 +10293,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezināma vecāku mape: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
@@ -10228,7 +10340,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nevarēju savienoties ar POP serveri %s"
@@ -10311,8 +10423,8 @@ msgstr ""
 "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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10324,55 +10436,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nevarēju izdzēst mapes kopsavilkuma failu `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nevarēju saglabāt kopsavilkumu: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nevarēju pievienot vēstuli kopsavilkumam: nezināms iemesls"
 
@@ -10390,53 +10502,44 @@ msgstr "Nevaru pievienot vēstuli maildir mapei: %s: %s"
 msgid "Invalid message contents"
 msgstr "Nepareizs vēstules saturs"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nevarēju atvērt mapi `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mape '%s' neeksistē."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nevarēju izveidot mapi `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s nav maildir direktorija."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nevarēju izdzēst mapi `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10458,9 +10561,9 @@ msgid "Checking for new messages"
 msgstr "Meklēju jaunās vēstules"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Glabāju mapi"
@@ -10504,159 +10607,137 @@ msgstr "Šī mape izskatās, ka ir neatgriezeniski sabojāta."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nevarēju atvērt failu '%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Nevaru izveidot mapi ar šādu nosaukumu"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nevarēja izveidot direktoriju %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Nevar piesaistīt failu %s: neregulārs fails"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nevarēju izveidot failu '%s':\n"
+"Nevarēja izdzēst mapi `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nav regulārs fails."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nevarēja izdzēst mapi `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mape `%s' nav tukša. Netika izdzēsta."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Nevaru izveidot mapi ar šādu nosaukumu"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Norādītais mapes nosaukums nav pareizs: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nevarēju atvērt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatāla pasta parsera kļūda tuvu pozīcijai %ld mapē %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nevarēju pārbaudīt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nevaru atvērt failu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nevaru atvērt pagaidu pastkasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nevarēju aizvērt avota mapi %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nevarēju aizvērt pagaidu mapi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nevarēju pārsaukt mapi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Kopsavilkuma un mapes neatbilšana, pat pēc sinhronizācijas"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezināma kļūda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nevarēju noglabāt mapi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Kļūda rakstot pagaidu pastkastē: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Rakstīšana uz pag. pastkasti neizdevusies: %s: %s"
@@ -10670,10 +10751,17 @@ msgstr "MH vēstules pievienošana atsaukta"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nevarēju izveidot mapi `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' nav direktorija."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Nevaru dabūt mapi: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10695,6 +10783,29 @@ msgstr "Spole '%s' nav regulārs fails vai direktorija"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mape `%s/%s' neekistē."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nevarēju atvērt mapi `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mape '%s' neeksistē."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nevarēju izveidot mapi `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10928,47 +11039,47 @@ msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nevaru pārvietot mapi uz vienu no tās apakšmapēm."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Nezināma kļūda: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nav tādas mapes: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nevaru dabūt grupu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nevarēju sagatavot vēstuli: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komanda neizdevusies: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Meklēju jaunas vēstules"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nezināma servera atbilde: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Izmantot atsaukumu"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operācija neizdevusies: %s"
@@ -11015,7 +11126,7 @@ msgstr "Dzēst pēc %s dienas(ām)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11104,7 +11215,7 @@ msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11156,7 +11267,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pasta nosūtīšana ar sendmail programmu"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11325,7 +11436,7 @@ msgstr "SMTP pasta nosūtīšana caur  %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nevar nosūtīt adresi: sūtītāja adrese nav pareiza."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
@@ -11431,34 +11542,34 @@ msgstr "QUIT pieprasījums iztecējis: %s"
 msgid "QUIT response error"
 msgstr "QUIT atbildes kļūda"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "piesaistne"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Izņemt izvēlētos priekšmetus no piesaistņu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Pievienot piesaitni..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Piesaistīt failu vēstulei"
 
@@ -11581,20 +11692,20 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Attach file(s)"
 msgstr "Piesaistīt failu"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11603,30 +11714,30 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11635,7 +11746,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11644,7 +11755,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11653,7 +11764,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11662,7 +11773,7 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11671,7 +11782,7 @@ msgstr ""
 "Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās sesijas.\n"
 "Vai jūs gribētu tos atjaunot?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11682,43 +11793,43 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta vēstule"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Paraksts:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Autoģenerēts"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Uzrakstīt vēstuli"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11726,7 +11837,7 @@ 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:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11738,7 +11849,7 @@ msgstr ""
 "Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
 "un libgtkhtml pareizās versijas.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11746,7 +11857,7 @@ msgstr ""
 "Nevarēju izveidot sacerētāja logu:\n"
 "Nespēju aktivizēt HTML redaktora komponenti."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12102,7 +12213,7 @@ msgstr "Tad"
 msgid "You must specify a folder."
 msgstr "Jums ir jānorāda mape.\n"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Izvēlēties mapi"
@@ -12117,19 +12228,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Svarīgs"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Darāmais"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Vēlāk"
 
@@ -12217,7 +12328,7 @@ msgstr ""
 "Vēstules datums tiks salīdzināts ar\n"
 "pašreizējo laiku, kad notiks filtrēšana."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuālās mapes"
 
@@ -12233,7 +12344,7 @@ msgstr "atpakaļ"
 msgid "months"
 msgstr "mēneši"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekundes"
 
@@ -12403,7 +12514,7 @@ msgstr "nav karogots"
 msgid "Junk Test"
 msgstr "Jūnijs"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Iezīme"
@@ -12511,9 +12622,10 @@ msgstr "sākas ar"
 msgid "Stop Processing"
 msgstr "Apturēt procesēšanu"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subjekts"
 
@@ -12521,25 +12633,25 @@ msgstr "Subjekts"
 msgid "Unset Status"
 msgstr "Noņemt statusu"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, fuzzy, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Noteikuma nosaukums '%s' nav unikāls, izvēlieties citu"
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Noteikumi"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Pievienot noteikumu"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Rediģēt noteikumu"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Noteikuma nosaukums:"
@@ -12580,16 +12692,16 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Jums jānosauc šī vmape."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Jums jānorāda vismaz viena mape kā avots."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "vMapes avoti"
@@ -12648,9 +12760,9 @@ msgstr "Evolution pasta mapes attēlošanas komponents."
 msgid "Evolution Mail preferences control"
 msgstr "Evolution pasta izpildkopsavilkuma komponente."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Pasts"
 
@@ -12658,7 +12770,7 @@ msgstr "Pasts"
 msgid "Mail Accounts"
 msgstr "Pasta konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Pasta Preferences"
 
@@ -12698,16 +12810,16 @@ msgstr "Lūdzu norādiet atļautu skripta nosaukumu"
 msgid "[script]"
 msgstr " [skripts]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Valoda"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Pievienot skripta parakstu"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Paraksti"
@@ -12795,7 +12907,6 @@ msgid "Unread messages"
 msgstr "Nākošā _neizlasītā vēstule"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 
@@ -12803,399 +12914,418 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Create New Folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Mapes nosaukums:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "vMapes"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Iesūtne"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Ielādēju..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nevarēju izdzēst mapi `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Patiešām izdzēst mapi \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dzēst \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Pārdēvēt mapi"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Atvērt jaunā logā"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Pārvietot"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Jauna mape"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Rekvizīti..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Atbildēt _visiem"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "S_ekojums..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Ka_rodziņš pabeigts"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā lasītu"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne_svarīgu"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Pār_vietot uz mapi..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "A_ttiecināt filtrus"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VMape ar subjektu"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r adresātiem"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar adresātu sarakstu"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz subjektu"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Noklusētais"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopēt saites lokāciju"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Atbilstumi:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Asignēts"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Rediģēt parakstu"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
+"Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
+"autnetiska."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Rediģēt parakstu"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Pārtraukts"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP kodējums"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikāta ID:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifikāts vēl nav derīgs"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, 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:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Nokavētie:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Skatīt iekļauti"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Slēpt"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. lapa no %d"
@@ -13239,29 +13369,34 @@ msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 msgid "Formatting message"
 msgstr "Pārvietojam vēstules"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "No"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Pastnieks"
 
@@ -13275,8 +13410,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13294,21 +13429,26 @@ msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Neatbalstīta shēma"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Neizdodas pārbaudīt lapas parakstu"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Neizdodas pārbaudīt lapas parakstu"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13320,60 +13460,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Neizdevās keišot %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Neizdevās keišot %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Nenosaukta vēstule"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Kopēt saiti pārlūkprogrammā"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sūtīt _vēstuli uz saraksti..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pievienot adrešu grāmatu"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
@@ -13423,18 +13563,18 @@ msgstr "Filtri"
 msgid "-------- Forwarded Message --------"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13443,7 +13583,7 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13452,32 +13592,38 @@ msgstr ""
 "Fails '%s' jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Vēstule"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Saglabāt vēstuli kā..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "_Adrese:"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Pasts no %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13490,7 +13636,7 @@ msgstr ""
 "\n"
 "Patiešām izdzēst šīs vēstules?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13518,323 +13664,331 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Vēstules noklusētais subjekts."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Vēstules noklusētais subjekts."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Meklēt tekstu attēlotajā vēstules ķermenī"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Noklusētais pārsūtīšanas stils ir:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Vēstules noklusētais subjekts."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Vēstules noklusētais subjekts."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Noklusētais pārsūtīšanas stils ir:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Norādīt, vai tiek rādīta mapes josla"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Sūtīt šo vēstuli vēlāk"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Pasta konti"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Parādīt vēstuli normālā stilā"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Apskata lauks"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Oriģinālais kontakts:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13842,176 +13996,173 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Sasaistīts vēstuļu saraksts"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Sasaistīts vēstuļu saraksts"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Mainīgs platums:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importēt"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importē jūsu veco Eim pastu"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importēju..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Lūdzu uzgaidiet"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importējam %s kā %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Skanējam %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importējam failus"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -14019,16 +14170,44 @@ msgstr ""
 "Evolution ir atradis Elm pasta failus\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Eim"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Dzēst šo mapi"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Izvēlēties mapi"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importējam"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importējam failus"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Skanējam %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritātes filtrs \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14054,7 +14233,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:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14066,7 +14245,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:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14080,31 +14259,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:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Skanēju pasta filtrus"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Skanējam direktoriju"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Sākam importu"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Pasta filtri"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14112,11 +14284,20 @@ msgstr ""
 "Evolution ir atradis Netscape pasta failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importē jūsu vecos Pine datus"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importējam failus"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adrešu grāmata"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14124,7 +14305,7 @@ msgstr ""
 "Evolution ir atradis Pine pasta failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14167,19 +14348,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Jūs neesat aizpildijis visu pieprasīto informāciju."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution kontu redaktors"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Hosts:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Ceļš:"
 
@@ -14231,28 +14412,43 @@ msgstr ""
 "    '%s'\n"
 "Un tiek atjaunota."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 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-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Jauna vMape"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Pasta filtri"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Izveidot jaunu mapi"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, ko kalendārs parādīs"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitāte"
 
@@ -14298,7 +14494,7 @@ msgstr ""
 "pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet servisa "
 "piegādātājam."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Kontu pārvaldība"
 
@@ -14325,120 +14521,116 @@ msgid "Connecting to server..."
 msgstr "Savienojamies ar serveri..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Kontu redaktors"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontu informācija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Pievienot sk_riptu"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Pievienot jaunu parakstu..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vienmēr nosūtīt _aklo kopiju (Cc) uz:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vienmēr nosūtīt _kopiju (Cc) uz:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Kodējot, vienmēr _uzticēties atslēgām manā atslēgu rinķī"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Piesaistīt orģinālo vēstuli"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Piesaistne"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltijas (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltijas (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Rakst_zīmju kopa:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Krāsas"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Pārbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Pārbaudīt pareizrakstību kāmēr es _rakstu"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Pārbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Krāsa _kļūdainajiem vārdiem:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Sacerēt vēstules"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14455,284 +14647,280 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Noklusētā uzvedība"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Noklusētais rakstzīmju ko_dējums:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Pasta dzēšana"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Necitēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _sanāksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Izdarīts"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Epasta konti"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Epasta _adrese:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontu asistents"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Izpildīt komandu..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fiksē_ts -platums:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Mazāk opcijas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Fontu rekvizīti"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatēt vēstules _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Galvene"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Izcelt _citātus ar"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Iekļaut"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Iezīmes un krāsas"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Ielādēju attēlus"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Pasta konfigurācija"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Vēstuļu sacerētājs"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Vēstules attēlošana"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Vēstule satur"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionāla informācija"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganizācija:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Drukātie fonti"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Atc_erēties šo paroli"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Saņemu epastu"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Saņemšanas _opcijas"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Atcerēties šo _paroli"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Pieprasītā informācija"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Atjaunot noklusējumus"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Drošais MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Sūtu epastu"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās un melnraksta vēstules"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Servera konfigurācija"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Servera _tips: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ķēdē pašparakstīts sertifikāts"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Norādiet _faila nosaukumu:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14742,7 +14930,7 @@ msgstr ""
 "paraksts. Nosaukums, kuru norādīsiet, tiks\n"
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14752,7 +14940,7 @@ msgstr ""
 "Valodu saraksts šeit parāda tikai tās valodas, kurām jums ir uzstādīta "
 "vārdnīca."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14760,15 +14948,15 @@ msgstr ""
 "Ievadiet nosaukumu, kādu jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Mainīgs platums:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -14779,177 +14967,177 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Pievienot parakstu"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas tips:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentifikācijas tips:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automātiski ievietot smaidiņu attēlus"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Pīkstēt, kad ir saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Apstiprināt, iztīrot mapi"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Noklusētais paraksts:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Noklusētie"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neziņojiet _man, kad ierodas jauns pasts"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Aktivizēt"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Pārsūtīšanas stils:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Pilns vārds:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML pasts"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identitāte"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Jūnijs"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā lasītas pēc"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Vārds:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nekad neielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Norādīt, kad sūta vēstules ar tukšu subjekta rindu"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Saņemot pastu"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Atjaunot noklusējumus"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skripts:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Dzēst..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Sūtot pastu"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Paraksti"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Oriģinālais kontakts:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
@@ -14972,7 +15160,7 @@ msgstr ""
 "Kļūda izpildot operāciju:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Strādāju"
 
@@ -14984,128 +15172,128 @@ msgstr "Filtrējam mapi"
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sūtu \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Kļūda pie %d vēstules no %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importējam %s kā %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokālās mapes"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Saņemu %d vēstuli(es)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saglabāju %d vēstuli(es)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15114,7 +15302,7 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15123,11 +15311,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15136,22 +15324,22 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15186,39 +15374,39 @@ msgstr "Izņēmumi"
 msgid "Security Information"
 msgstr "Avota informācija"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Atsaucu..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serveris: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ceļš: %s, Tips: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tips: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Sūtīt un saņemt pastu"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Atcelt Visu"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Atjauninu..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Gaidu..."
 
@@ -15327,20 +15515,20 @@ msgstr ""
 "    '%s'\n"
 "Un tagad tiek atjauninātas."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mēģinājums rediģēt vmapi '%s', kur īstenībā neeksistē"
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
@@ -15674,99 +15862,20 @@ msgstr "Nesaistes mapes"
 msgid "Autocompletion Folders"
 msgstr "Autoaizpildes mapes"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Nevaru nokopēt mapi: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Nevaru pārvietot mapi: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Nevaru pārvietot mapi pār sevi pašu."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Nevaru nokopēt mapi pār sevi pašu."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Nevaru pārvietot mapi uz vienu no tās apakšmapēm."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Norādiet mapi, uz kurieni kopēt mapi \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Kopēt mapi"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Norādiet mapi, uz kuru pārvietot mapi \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Pārvietot mapi"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Nevaru izdzēst mapi:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Patiešām izdzēst mapi \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Nevaru pārsaukt mapi:\n"
+"Nevar izveidot norādīto mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Norādītais mapes nosaukums nav pareizs: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Izvēlētā mape nepieder citam lietotājam"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nevar izņemt mapi:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Nevar izveidot norādīto mapi:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nenosaukts)"
@@ -15907,7 +16016,7 @@ msgstr "Neizdevās palaist gpg."
 msgid "_Import"
 msgstr "Importēt"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Aizvērt savienojumus..."
 
@@ -15946,6 +16055,10 @@ msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 msgid "Cannot find the specified shared folder."
 msgstr "Nevar atrast norādīto koplietošanas mapi."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Sākam importu"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16058,128 +16171,6 @@ msgstr "Konfigurāciju datubāze nav atrasta"
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Izveidot jaunu saīsinājumu grupu"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Grupas nosaukums:"
-
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Vai jūs patiešām vēlaties izņemt grupu\n"
-"`%s' no saīsinājumu joslas?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Pārdēvēt saīsinājumu grupu"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Pārdēvēt izvēlēto saīsinājumu grupu par:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Mazas ikonas"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Parādīt saīsinājumus kā mazas ikonas"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Lielas ikonas"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Parādīt saīsinājumus kā lielas ikonas"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "_Jauna grupa..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Izveidot jaunu saīsinājumu grupu"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Izņemt šo grupu..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Izņemt šo saīsinājumu grupu"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Pārsaukt šo grupu..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Pārdēvēt saīsinājumu grupu"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Paslēpt saīsinājumu joslu"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Paslēpt saīsinājumjoslu"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Izveidot _noklusētos saīsinājumus"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Izveidot noklusētos saīsinājumus"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Pārdēvēt saīsinājumu"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Pārdēvēt izvēlēto saīsinājumu par:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Atvērt mapi sasaistītu ar šo saīsinājumu"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Atvērt _jaunā logā"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Atvērt mapi, saistītu ar šo īsinājumu jaunā logā"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Pārdēvēt šo saīsinājumu"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Izņemt"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Kļūda glabājot saīsinājumus."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Saīsinājumi"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Izvēles rūtiņa"
@@ -16190,11 +16181,6 @@ msgstr "Izvēles rūtiņa"
 msgid "New"
 msgstr "Jauna"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" iekš \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16500,59 +16486,59 @@ msgstr ""
 "%s: --online un --offline nevar tikt lietoti kopā.\n"
 "  Izmantojiet %s --help, lai iegūtu vairāk informācijas.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Izvēlēties mapi"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Progress"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Izteiksme"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Epasta adrese:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Sertifikāta der. laiks iztecējis: %s\n"
 "Izsniedzējs: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Ievadiet %s paroli"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16621,7 +16607,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Sertifikāta ID:"
@@ -16696,11 +16682,11 @@ msgstr "Organizācija"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16749,243 +16735,243 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermonta"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermiliona"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermiliona"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermiliona"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "Z"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "Z"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Neuzticams sertifikāts"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Publiskā atslēga: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Subjekts ir %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nespēj procesēt spoles mapi"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Nepareiza sertifikāta autoritāte (SA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Nepareiza sertifikāta autoritāte (SA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nav Informācijas"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "piesaistne"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Ziemeļkarolīna"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Izteiksme"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s iekš %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikāta paraksta neizdošanās"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Ievietot"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Subjekts ir %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sertifikāta paraksta neizdošanās"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Ievadiet %s paroli"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Sertifikāta ID:"
@@ -17594,7 +17580,8 @@ msgid "_Threaded Message List"
 msgstr "_Sasaistīts Vēstuļu saraksts"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Pievienot sūtītāju a_drešu grāmatai"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17602,7 +17589,8 @@ msgid "A_pply Filters"
 msgstr "A_ttiecināt filtrus"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Pievienot sūtītāju adrešu grāmatai"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18055,10 +18043,6 @@ msgstr "For_māts"
 msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Atvērt"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Atvērt failu"
@@ -18430,22 +18414,6 @@ msgstr "_Sūtīt / Saņemt"
 msgid "_Window"
 msgstr "_Meklēt Tagad"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Drukāt kopsavilkumu"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Drukāt kopsavilkumu"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Pārlādēt"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Pārlādēt skatu"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Pēc _kompānijas"
@@ -18512,8 +18480,8 @@ msgstr "Ar _kategoriju"
 msgid "_Tasks"
 msgstr "_Uzdevumi"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18764,24 +18732,24 @@ msgstr "_Meklēt"
 msgid "_Find Now"
 msgstr "_Meklēt Tagad"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Tīrs"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 #, fuzzy
 msgid "Text"
 msgstr "Tests"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Meklēt tagad"
@@ -18796,6 +18764,210 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adrešu grāmatas resursi"
+
+#~ msgid "No data provided"
+#~ msgstr "Nav piegādāti dati"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevarēju atvērt failu '%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevarēja izveidot direktoriju %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevarēju izveidot failu '%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' nav direktorija."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importējam %s kā %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Skanēju pasta filtrus"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Skanējam direktoriju"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Nevaru nokopēt mapi: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Nevaru pārvietot mapi: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Nevaru pārvietot mapi pār sevi pašu."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Nevaru nokopēt mapi pār sevi pašu."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Nevaru pārvietot mapi uz vienu no tās apakšmapēm."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Norādiet mapi, uz kurieni kopēt mapi \"%s\":"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Kopēt mapi"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Norādiet mapi, uz kuru pārvietot mapi \"%s\":"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Pārvietot mapi"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevaru izdzēst mapi:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Patiešām izdzēst mapi \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevaru pārsaukt mapi:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Izvēlētā mape nepieder citam lietotājam"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nevar izņemt mapi:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Izveidot jaunu saīsinājumu grupu"
+
+#~ msgid "Group name:"
+#~ msgstr "Grupas nosaukums:"
+
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Vai jūs patiešām vēlaties izņemt grupu\n"
+#~ "`%s' no saīsinājumu joslas?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Pārdēvēt saīsinājumu grupu"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Pārdēvēt izvēlēto saīsinājumu grupu par:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Mazas ikonas"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Parādīt saīsinājumus kā mazas ikonas"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Lielas ikonas"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Parādīt saīsinājumus kā lielas ikonas"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "_Jauna grupa..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Izveidot jaunu saīsinājumu grupu"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Izņemt šo grupu..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Izņemt šo saīsinājumu grupu"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Pārsaukt šo grupu..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Pārdēvēt saīsinājumu grupu"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Paslēpt saīsinājumu joslu"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Paslēpt saīsinājumjoslu"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Izveidot _noklusētos saīsinājumus"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Izveidot noklusētos saīsinājumus"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Pārdēvēt saīsinājumu"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Pārdēvēt izvēlēto saīsinājumu par:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Atvērt mapi sasaistītu ar šo saīsinājumu"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Atvērt _jaunā logā"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Atvērt mapi, saistītu ar šo īsinājumu jaunā logā"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Pārdēvēt šo saīsinājumu"
+
+#~ msgid "Re_move"
+#~ msgstr "_Izņemt"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Kļūda glabājot saīsinājumus."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Saīsinājumi"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" iekš \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Drukāt kopsavilkumu"
+
+#~ msgid "Print summary"
+#~ msgstr "Drukāt kopsavilkumu"
+
+#~ msgid "Reload"
+#~ msgstr "Pārlādēt"
+
+#~ msgid "Reload the view"
+#~ msgstr "Pārlādēt skatu"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopēt uz mapi..."
 
@@ -19445,21 +19617,9 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Cita adrese"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evoluion importēšanas asistents"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Evoluion importēšanas asistents"
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolution pasta sacerētājs."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolution pasta sacerētājs."
-
 #~ msgid "Searching..."
 #~ msgstr "Meklēju..."
 
@@ -27441,10 +27601,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Appointments"
 #~ msgstr "Tikšanās"
 
-#, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Nav tikšanos"
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27949,9 +28105,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Moderate mist"
 #~ msgstr "Mērena dūmaka"
 
-#~ msgid "Thick mist"
-#~ msgstr "Bieza dūmaka"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Neliela dūmaka"
 
@@ -28480,9 +28633,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Izveidot jaunu logu šai mapei"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Dzēst šo mapi"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Parādīt citu mapi"
 
diff --git a/po/mn.po b/po/mn.po
index b1d233f969..886b255a83 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -47,8 +47,7 @@ msgstr "Автомат гүйцээлтийг энд тохируул"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Холбоонууд"
 
@@ -88,19 +87,20 @@ msgstr "Эволюшин хавтасны тохируулгын тохиргу�
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Шинэ хаягийн дэвтэр"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -108,65 +108,65 @@ msgstr "Шинэ хаягийн дэвтэр"
 msgid "Delete"
 msgstr "Устгах"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Шинжүүд:"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Шинэ холбоо"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Холбоо"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Шинэ холбоо үүсгэх"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Шинэ холбооны жагсаалт"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Холбооны жагсаалт"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Шинэ холбооны жагсаалт үүсгэх"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP  серверт холбогдож чадсангүй"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP серверээр баталгаажуулж чадсангүй"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr ""
 
@@ -179,41 +179,43 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Энэ компьютер дээр"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Хувийн"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "LDAP серверүүдэд"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP серверүүдэд"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Автоматаар гүйцээх"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -221,7 +223,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -229,19 +231,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Энэ хүсэлт амжилттай дууссангүй."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -250,20 +252,20 @@ msgstr ""
 "Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
 " болон хандах эрхээ шалгана уу."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -272,27 +274,31 @@ msgstr ""
 "Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
 " болон хандах эрхээ шалгана уу."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Хаягийн дэвтрийг нээх боломжгүй"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Баталгаажуулалт хийж чадсангүй.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+msgid "The URI that the address book will display"
+msgstr ""
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -336,7 +342,7 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -368,20 +374,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Хаягийн дэвтэр үүсгэгч туслах"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Хаягийн дэвтэр"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr ""
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Хаягийн дэвтэр..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Үргэлж"
 
@@ -392,7 +400,8 @@ msgstr "Хэн нэгэнээр"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -401,50 +410,50 @@ msgstr ""
 "Та энд оруулсан тохируулгуудаа хадгалахын тулд \"Дуусга\" товч дээр товшино "
 "уу."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Холбогдож байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Коста Рика"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Дууссан"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ерөнхий"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Бүлэг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Хэзээ ч"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -454,30 +463,30 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Нэг"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Хайх _хүрээ"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Хайж байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Тэмдэглэгдсэн:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -488,7 +497,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -497,7 +506,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -505,40 +514,42 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Дүрслэх нэр болон бүлгийг тодорхойлох нь хаягийн дэвтрийн тохиргооны эхний "
 "алхам юм."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "1-р алхам: Хавтасны үзүүлэлтүүд "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "2-р алхам: Серверийн мэдээлэл"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "3-р алхам: Серверт холбогдох"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "4-р алхам: Хавтсыг хайх"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Дэд"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Дэмжигдсэн хайлтын сууриуд"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -547,7 +558,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -555,7 +566,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -565,50 +576,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -616,28 +628,28 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS ашиглах:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Ц-шуудангийн хаяг ашиглан"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Хэзээ ч боломжтой"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -645,19 +657,19 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Харуулах нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Татаж авах хязгаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -666,39 +678,39 @@ msgstr "_Татаж авах хязгаар:"
 msgid "_Edit"
 msgstr "_Засварлах"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Нэвтрэх арга:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Портын дугаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Серверийн нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "картууд"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr ""
 
@@ -818,7 +830,7 @@ msgstr "Хамтын ажиллагаа"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Холбооны засварлагч"
 
@@ -908,10 +920,10 @@ msgstr ""
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -959,15 +971,15 @@ msgid "_Web page address:"
 msgstr "_Вэб хуудасны хаяг:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Хаяг"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1958,158 +1970,171 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Дараагийн зурвас"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Эх үүсвэр"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Байршил:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Шинээр нэрлэх"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Гэрийн"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Ажилын"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Бусад"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Эх дэвтэр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Холбоо"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Өөрчлөгдсөн"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 #, fuzzy
 msgid "Account Name"
 msgstr "_Данс:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Бизнес"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Бүлэг"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Бүтэн нэр:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "_Ц-шуудан:"
 
@@ -2267,11 +2292,11 @@ msgid "Is New List"
 msgstr "Шинэ жагсаалт"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2356,13 +2381,13 @@ msgid "Email begins with"
 msgstr "Ц-шуудангийн эхний үсэг"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
@@ -2379,101 +2404,101 @@ msgid "Type"
 msgstr "Төрөл"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Шинэ холбоо..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Шинэ холбооны жагсаалт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Хавтас руу оч..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Оруулах..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Хэвлэх"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Хайчлах"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Хуулах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Буулгах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Одоогийн үзэмж"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2482,8 +2507,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr ""
 
@@ -2526,7 +2551,7 @@ msgid "Company Phone"
 msgstr "Компанийн утас"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Ц-шуудан"
 
@@ -2585,7 +2610,7 @@ msgid "Nickname"
 msgstr "Хоч"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Тэмдэглэл"
 
@@ -2594,7 +2619,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Байгууллага"
 
@@ -2712,66 +2737,72 @@ msgstr "Тэмдэглэгдсэн"
 msgid "Has Cursor"
 msgstr "Курсортой"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Гишүүдийг жагсаах"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Ц-шуудан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Ажилын"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Тайлбар"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Бүлэг"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Машины утас"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Хувийн"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Албан тушаал"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Вэб хуудас"
 
@@ -2780,8 +2811,8 @@ msgid "Success"
 msgstr "Амжилттай"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2811,7 +2842,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2831,8 +2862,9 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
-msgstr ""
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Хаягийн дэвтэр"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -2962,8 +2994,9 @@ msgid "Add address to existing contact \"%s\""
 msgstr ""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Хаягийн дэвтэр..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -3017,17 +3050,40 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Эволюшин оруулах туслагч"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Эволюшин сэрүүлэг"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Эволюшин сэрүүлэг"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Холбоонуудыг хэвлэх"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Холбоог хэвлэх"
 
@@ -3119,7 +3175,7 @@ msgstr "Захын зайнууд"
 msgid "Number of columns:"
 msgstr "Багануудын тоо:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr ""
 
@@ -3295,8 +3351,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Нэр үгүй жагсаалт"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr ""
 
@@ -3373,10 +3429,9 @@ msgid "Evolution's Tasks component"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Үүргүүд"
 
@@ -3420,26 +3475,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Нээх"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Нээх"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Тайлбар алга."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3448,12 +3501,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3461,7 +3514,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3472,19 +3525,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3620,24 +3673,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Дүгнэлтэд агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Тохироогүй"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Хуанли"
 
@@ -3664,7 +3723,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3686,70 +3745,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Зориулалт"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Шинэ зориулалт үүсгэх"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Уул_залт"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Шинэ уулзалтын хүсэлт үүсгэх"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Бүтэн өдрийн шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Бүтэн _өдрийн төлөвлөгөө"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "_Хуанли"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Шинэ хуанли үүсгэх"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3883,7 +3942,7 @@ msgstr "цаг"
 msgid "minutes"
 msgstr "минут"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -3957,7 +4016,7 @@ msgid "hour(s)"
 msgstr "цаг"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "минут"
 
@@ -3968,7 +4027,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr ""
 
@@ -4020,7 +4079,7 @@ msgstr "30 минут"
 msgid "60 minutes"
 msgstr "60 минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4045,7 +4104,7 @@ msgid "Days"
 msgstr "Өдөр"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr ""
 
@@ -4189,7 +4248,7 @@ msgid "_Fri"
 msgstr "_Баа"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Ерөнхий"
 
@@ -4290,7 +4349,7 @@ msgstr ""
 "уу."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
@@ -4445,23 +4504,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr "-д"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr "(Дууссан"
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Дууссан"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4497,8 +4556,8 @@ msgstr ""
 msgid "No summary"
 msgstr "Дүгнэлт алга"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Нэрээр хадгалах..."
 
@@ -4526,9 +4585,20 @@ msgstr "`%s' хавтсыг нээж чадахгүй байна"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
-msgstr ""
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Үйлдлээ тэмдэглэх"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Хуанли"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Үүргийн жагсаалтын нэр"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4632,7 +4702,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Уулзалт"
 
@@ -4656,23 +4726,31 @@ msgstr ""
 msgid "Meeting"
 msgstr "Уулзалт"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Эхлэх өдөр буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Төгсөх өдөр буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Эхлэх цаг буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Төгсөх цаг буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
@@ -4752,29 +4830,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Алга"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Зохион байгуулагч шаардлагатай."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4959,7 +5037,7 @@ msgstr ""
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Он сар өдөр/цаг"
 
@@ -4994,7 +5072,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Устгах"
 
@@ -5033,7 +5111,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
 
@@ -5057,7 +5135,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5070,7 +5148,7 @@ msgstr "% _дууссан"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Дууссан"
 
@@ -5083,7 +5161,7 @@ msgstr "Өндөр"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Явж байна"
 
@@ -5102,7 +5180,7 @@ msgstr "Хэвийн"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Эхлээгүй"
 
@@ -5143,16 +5221,16 @@ msgstr "Энгийн"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5163,7 +5241,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Тайлбар:"
 
@@ -5354,11 +5432,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Дүгнэлт"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "өнгө"
 
@@ -5383,7 +5460,7 @@ msgstr "Х"
 msgid "S"
 msgstr "У"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr ""
 
@@ -5415,10 +5492,10 @@ msgstr "Үгүй"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Үл мэдэгдэх"
@@ -5431,99 +5508,105 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Шинэ _уулзалт..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Хэвлэх..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Буулгах"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Нээх"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Нэрээр хадгалах..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Хуулах"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Тохируулгууд..."
 
@@ -5610,7 +5693,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Дууссан"
 
@@ -5668,26 +5751,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5868,7 +5951,7 @@ msgid "Send Latest Information"
 msgstr "Сүүлийн мэдээллүүдийг илгээх"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Цуцлах"
@@ -6321,12 +6404,12 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6334,7 +6417,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6342,41 +6425,51 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Жагсаалтыг устгахад алдаа гарлаа"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Тэмдэглэгдсэн обьектуудыг устгаж байна..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Хуанлийг ачааллаж байна"
+
+#: calendar/gui/gnome-cal.c:1763
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s-г нэмж байна"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6495,16 +6588,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6512,7 +6605,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6520,12 +6613,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Вэб дээр"
 
@@ -6714,49 +6807,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr ""
 
@@ -6765,36 +6858,36 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6847,26 +6940,26 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Уулзалт"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -8522,7 +8615,7 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr ""
 
@@ -8603,7 +8696,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8611,45 +8704,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8657,58 +8746,58 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr ""
 
@@ -8818,21 +8907,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr ""
@@ -8971,7 +9073,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9102,20 +9204,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9176,21 +9265,25 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr ""
@@ -9398,21 +9491,31 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9428,15 +9531,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Хаягийн дэвтэр"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9456,68 +9554,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr ""
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "жагсаах"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9532,7 +9628,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9541,12 +9637,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9560,25 +9656,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9633,27 +9729,35 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9662,64 +9766,64 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9727,24 +9831,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -9765,7 +9877,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr ""
@@ -9843,8 +9955,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9856,55 +9968,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -9922,49 +10034,44 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
 #, c-format
-msgid "Folder `%s' does not exist."
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:134
 #, c-format
-msgid "`%s' is not a maildir directory."
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -9986,9 +10093,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr ""
@@ -10030,148 +10137,132 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10185,9 +10276,14 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
 #: camel/providers/local/camel-mh-store.c:229
 #, c-format
-msgid "`%s' is not a directory."
+msgid "Cannot get folder `%s': not a directory."
 msgstr ""
 
 #: camel/providers/local/camel-mh-summary.c:244
@@ -10210,6 +10306,25 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10431,47 +10546,47 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Үл мэдэгдэх алдаа"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Мэдээллийг хавтсанд хадгалах"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10518,7 +10633,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -10598,7 +10713,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -10650,7 +10765,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr ""
 
@@ -10813,7 +10928,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -10919,34 +11034,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11060,82 +11175,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11143,49 +11258,49 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11193,13 +11308,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11535,7 +11650,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr ""
@@ -11548,19 +11663,19 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr ""
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11642,7 +11757,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11658,7 +11773,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr ""
 
@@ -11828,7 +11943,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "6-р сар"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -11936,9 +12051,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
 
@@ -11946,25 +12062,25 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -12012,15 +12128,15 @@ msgstr "Дүгнэлтэд агуулагдаж байна"
 msgid "Subject does not contain"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr ""
 
@@ -12069,9 +12185,9 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr ""
 
@@ -12079,7 +12195,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12117,15 +12233,15 @@ msgstr ""
 msgid "[script]"
 msgstr ""
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12199,7 +12315,6 @@ msgid "Unread messages"
 msgstr "Дараагийн _уншигдаагүй мэдээлэл"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12207,374 +12322,390 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr ""
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr ""
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, c-format
+msgid "Cannot delete local %s folder."
+msgstr ""
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, c-format
+msgid "Cannot rename local %s folder."
+msgstr ""
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr ""
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
@@ -12617,29 +12748,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -12653,8 +12789,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 ""
 
@@ -12671,19 +12807,24 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12695,56 +12836,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr ""
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12789,53 +12930,59 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr ""
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr ""
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Илгээх зурвас"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12844,7 +12991,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -12865,293 +13012,299 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
-msgid "Default forward style"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:12
-msgid "Default height of the Message Window"
+msgid "Default forward style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:13
-msgid "Default reply style"
+msgid "Default height of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:14
-msgid "Default width of the Message Window"
+msgid "Default height of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default reply style"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Enable/disable caret mode"
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Height of the message-list pane"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Height of the message-list pane."
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:22
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13159,183 +13312,206 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Оруулах"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr ""
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr ""
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+msgid "Destination folder:"
+msgstr ""
+
+#: mail/importers/evolution-mbox-importer.c:119
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Файлуудыг оруулж байна"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Файлуудыг оруулж байна"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13350,7 +13526,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13358,7 +13534,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13367,47 +13543,49 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr ""
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Файлуудыг оруулж байна"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Хаягийн дэвтэр"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr ""
 
@@ -13447,19 +13625,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -13508,27 +13686,42 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "_Хавтас руу зөөх"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "_Хавтас"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Шинэ хуанли үүсгэх"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13563,7 +13756,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -13585,118 +13778,114 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr " "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13706,476 +13895,472 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14194,7 +14379,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr ""
 
@@ -14206,168 +14391,168 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14399,38 +14584,38 @@ msgstr ""
 msgid "Security Information"
 msgstr ""
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr ""
 
@@ -14530,20 +14715,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr ""
 
@@ -14856,89 +15041,18 @@ msgstr ""
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
@@ -15061,7 +15175,7 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15099,6 +15213,10 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15203,123 +15321,6 @@ msgstr ""
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr ""
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15330,11 +15331,6 @@ msgstr ""
 msgid "New"
 msgstr "Шинэ"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15595,52 +15591,52 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Батламжийн нэр"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Зориулалтууд"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Серийн дугаар"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Ц-шуудангийн хаяг"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15701,7 +15697,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Батламж"
 
@@ -15766,11 +15762,11 @@ msgstr "Байгууллагын нэгжм (БН)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 хуоууны хээ"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL харилцагчийн батламж"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL серверийн батламж"
 
@@ -15815,209 +15811,209 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr ""
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Хувилбар"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Хувилбар 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Хувилбар 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Хувилбар 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Тэмдэглэж байна"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Ноцтой"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Ноцтой бус"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Өргөтгөлүүд"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
@@ -16604,16 +16600,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "Хаягийн дэвтэр..."
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Хаягийн дэвтэр..."
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17057,10 +17055,6 @@ msgstr "Хэл_бэр"
 msgid "HT_ML"
 msgstr "Х_ТМЛ"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Нээх"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Файлыг нээх"
@@ -17423,22 +17417,6 @@ msgstr "_Илгээх/хүлээж авах"
 msgid "_Window"
 msgstr "_Цонх"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Дүгнэлтийг хэвлэх"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Дүгнэлтийг хэвлэх"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Шинээр ачааллах"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Үзэмжийг шинээр ачааллах"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Компаниар"
@@ -17499,8 +17477,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr "_"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -17740,23 +17718,23 @@ msgstr "_Хайх"
 msgid "_Find Now"
 msgstr "_Одоо ол"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Цэвэрлэх"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Текст"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Одоо _ол"
 
@@ -17770,6 +17748,21 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "    "
+#~ msgstr " "
+
+#~ msgid "Print Summary"
+#~ msgstr "Дүгнэлтийг хэвлэх"
+
+#~ msgid "Print summary"
+#~ msgstr "Дүгнэлтийг хэвлэх"
+
+#~ msgid "Reload"
+#~ msgstr "Шинээр ачааллах"
+
+#~ msgid "Reload the view"
+#~ msgstr "Үзэмжийг шинээр ачааллах"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Хавтас руу хуулах..."
 
diff --git a/po/ms.po b/po/ms.po
index 50461506f3..87fbf7e9c9 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -49,8 +49,7 @@ msgstr "Buat konfigurasi akaun e-mel anda di sini"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kenalan"
 
@@ -90,20 +89,20 @@ msgstr "Kawalan konfigurasi seting folder Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Urus sijil S/Mime anda di sini"
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -111,67 +110,67 @@ msgstr "Buku Alamat"
 msgid "Delete"
 msgstr "Hapus"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Ciri-ciri..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Kenalan Baru:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kenalan"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Wujudkan kenalan baru"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Senarai Kenalan Baru"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Senarai Kenalan Baru"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Wujudkan senarai kenalan baru"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Gagal disambungkan ke pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Gagal disahkan dengan pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Tidak dapat membuat pertanyaan pada Asas DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Ralat ketika mendapatkan semula maklumat skema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Sedang menunggu..."
@@ -185,42 +184,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s berdenting"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Atas Komputer Ini"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Peribadi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Folder Autocompletion"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -233,7 +234,7 @@ msgstr ""
 "Sila jadikan carian anda lebih khusus atau tingkatkan had hasil dalam\n"
 "keutamaan pelayan direktori bagi buku alamat ini."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -245,20 +246,20 @@ msgstr ""
 "lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
 "direktori bagi buku alamat ini."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bahagian belakang buku alamat ini enggan membuat pertanyaan ini."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -267,7 +268,7 @@ msgstr ""
 "Kami tidak dapat membuka buku alamat ini.  Sila semak ada\n"
 "laluan atau tidak dan adakah anda diberi kebenaran untuk mencapainya."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -277,7 +278,7 @@ msgstr ""
 "sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
 "tidak dapat dijangkau."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -290,7 +291,7 @@ msgstr ""
 "anda mestilah kompilkan atur cara dari sumber CVS setelah\n"
 "mendapatkan semula OpenLDAP dari pautan di bawah.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -300,28 +301,33 @@ msgstr ""
 "sama ada anda telah memasukkan URI yang tidak betul, atau pelayan\n"
 "tidak dapat dijangkau."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Tidak dapat membuka buku alamat"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Mencapai Pelayan LDAP tanpa nama"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Gagal disahkan.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI yang akan dipaparkan oleh kalendar"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -365,7 +371,7 @@ msgstr "  T_unjukkan Asas Sokongan"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -398,20 +404,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Pembantu Konfigurasi LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Sumber Buku Alamat"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Sumber Buku Alamat"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Sumber Buku Alamat..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Sentiasa"
 
@@ -422,7 +429,8 @@ msgstr "Tanpa nama"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -432,54 +440,54 @@ msgstr ""
 "Sila klik butang \"Selesai\" untuk menyimpan seting yang anda masukkan di "
 "sini."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Disambungkan"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Nama_ berbeza:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Selesai"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Kumpulan"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Tidak Pernah"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -495,23 +503,23 @@ msgstr ""
 "secara kriptografi. Tanya pentadbir sistem anda sama ada pelayan LDAP anda "
 "menggunakan protokol ini atau tidak."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Satu"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Skop C_arian: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Sedang mencari"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Dipilih:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -521,7 +529,7 @@ msgstr ""
 "LDAP anda jika\n"
 "pelayan LDAP anda menyokong SSL atau TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -539,7 +547,7 @@ msgstr ""
 "sambungan anda sudah\n"
 "selamat."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -553,7 +561,7 @@ msgstr ""
 "kepada eksploitasi\n"
 "keselamatan. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -564,44 +572,45 @@ msgstr ""
 "carian\n"
 "LDAP, dan bagi mewujudkan dan mengedit kenalan. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Menetapkan nama paparan ialah langkah terakhir yang diperlukan dalam membuat "
 "konfigurasi pelayan LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Langkah 1: Maklumat Pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Langkah 2: Sambungkan ke Pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Langkah 3: Mencari dalam Direktori"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Asas Carian Sokongan"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -615,7 +624,7 @@ msgstr ""
 "sama ada anda\n"
 "perlu mengubah opsyen ini atau tidak."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -626,7 +635,7 @@ msgstr ""
 "bermula. Jika anda membiarkannya kosong, carian akan bermula pada akar "
 "pepohon direktori."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -641,12 +650,13 @@ msgstr ""
 "Skop carian bagi \"satu\" akan hanya merangkumi entri satu tahap di bawah "
 "asas anda.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -657,24 +667,25 @@ msgstr ""
 "hubungi pentadbir sistem anda jika anda memerlukan bantuan untuk mendapatkan "
 "maklumat ini."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Ini bilangan maksimum entri untuk dimuat turun. Mengesetkan bilangan ini "
 "sehingga \n"
 "terlalu besar akan melambatkan buku alamat anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -684,7 +695,7 @@ msgstr ""
 "perhatian bahawa mengesetkannya kepada \"Alamat E-mel\" memerlukan capaian "
 "tanpa nama kepada pelayan ldap anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -694,7 +705,7 @@ msgstr ""
 "anda.\n"
 "Ia untuk tujuan paparan sahaja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -705,7 +716,7 @@ msgstr ""
 "anda.\n"
 "Ia untuk tujuan paparan sahaja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -716,28 +727,28 @@ msgstr ""
 "senarai port piawai telah diberikan. Tanya pentadbir sistem anda\n"
 "apakah port yang patut anda tetapkan."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "G_unakan SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Menggunakan nama berbeza (NB)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Menggunakan alamat e-mel"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Pada bila-bila masa yang mungkin"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -750,19 +761,19 @@ msgstr ""
 "anda. Sila tanya pentadbir sistem anda jika anda tidak pasti tentang "
 "maklumat ini."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Paparkan nama:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -771,39 +782,39 @@ msgstr "_Had muat turun:"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Kaedah log masuk:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Nombor port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Nama pelayan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Tamat masa (minit):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kad"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "tab sambung"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "tab am"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "tab cari"
 
@@ -925,7 +936,7 @@ msgstr "Kerjasama"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor Kenalan"
 
@@ -1022,10 +1033,10 @@ msgstr "_Kategori..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1073,15 +1084,15 @@ msgid "_Web page address:"
 msgstr "_Alamat laman web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Alamat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2073,108 +2084,116 @@ msgid "AOL Instant Messenger"
 msgstr "_Kiriman Mesej"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Senarai Id Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Mesej Mel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Khidmat boleh digunakan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Lokasi:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Nama_pengguna:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Rumah"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Kerja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Lain"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Sumber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kenalan"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Merupakan Kenalan Baru"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Medan Boleh Tulis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Diubah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nama Akaun"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Editor kategori tidak ada."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Kenalan ini tergolong dalam kategori ini:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Simpan Kenalan sebagai VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2182,7 +2201,7 @@ msgstr ""
 "Adakah anda pasti ingin\n"
 "menghapuskan kenalan ini?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2190,47 +2209,52 @@ msgstr ""
 "Adakah anda pasti ingin\n"
 "menghapuskan kenalan ini?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Perniagaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Kumpulan"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Tambah Cepat Kenalan"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Edit Penuh "
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Nama Penuh:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-mel:"
 
@@ -2389,11 +2413,11 @@ msgid "Is New List"
 msgstr "Ialah Senarai Baru"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor Senarai Kenalan"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Simpan Senarai sebagai VCard"
 
@@ -2482,13 +2506,13 @@ msgid "Email begins with"
 msgstr "E-mel bermula dengan"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorinya ialah"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Sebarang medan mengandungi"
 
@@ -2505,101 +2529,101 @@ msgid "Type"
 msgstr "Jenis"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Simpan sebagai VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Senarai Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Pergi ke Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Carian Kenalan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Sumber Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Seting Rintis..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Sampaikan kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Hantar Mesej kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Cetak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Cetak Sampul Surat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Potong"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Salin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Tampal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Pandangan Semasa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2612,8 +2636,8 @@ msgstr ""
 "semula"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Sebarang Kategori"
 
@@ -2656,7 +2680,7 @@ msgid "Company Phone"
 msgstr "Telefon Syarikat"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mel"
 
@@ -2717,7 +2741,7 @@ msgid "Nickname"
 msgstr "Nama ringkas"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Nota"
 
@@ -2726,7 +2750,7 @@ msgid "Office"
 msgstr "Pejabat"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisasi"
 
@@ -2854,65 +2878,71 @@ msgstr "Dipilih"
 msgid "Has Cursor"
 msgstr "Mempunyai Kursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Senaraikan Ahli"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-mel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Kerja"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Kumpulan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Peribadi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Gelaran Jawatan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Laman web"
 
@@ -2921,8 +2951,8 @@ msgid "Success"
 msgstr "Berjaya"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2952,7 +2982,7 @@ msgstr "Protokol tidak disokong"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2972,7 +3002,8 @@ msgid "TLS not Available"
 msgstr "TLS tidak Ada"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Buku Alamat tidak wujud"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3107,7 +3138,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Tambahkan alamat pada kenalan sedia ada \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Pertanyaan Buku Alamat..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3162,17 +3194,37 @@ msgstr "Hakcipta (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Ini sepatutnya menguji item kanvas aliran semula"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Pengimport LDIF Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Format Saling Tukar Data LDAP (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Pengimport VCard Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Pengimport VCard Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Cetak sampul surat"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Cetak kenalan"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Cetak kenalan"
 
@@ -3264,7 +3316,7 @@ msgstr "Jidar"
 msgid "Number of columns:"
 msgstr "Bilangan lajur:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opsyen"
 
@@ -3443,8 +3495,8 @@ msgstr "Tiada nama fail diberikan. "
 msgid "Unnamed List"
 msgstr "Senarai Tanpa Nama"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Masukkan Kata Laluan"
@@ -3522,10 +3574,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponen ujian Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Tugas"
 
@@ -3569,26 +3620,24 @@ msgstr "Masa tidur sekejap (minit)"
 msgid "_Edit appointment"
 msgstr "_Edit temu janji"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Buka"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Buka"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Tidak ada huraian."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3601,12 +3650,12 @@ msgstr ""
 "Bermula pada %s\n"
 "Berakhir pada %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Amaran"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3618,7 +3667,7 @@ msgstr ""
 "dikonfigurasikan untuk menghantar e-mel. Evolution sebaliknya akan\n"
 "memaparkan kotak dialog peringatan yang normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3635,19 +3684,19 @@ msgstr ""
 "\n"
 "Adakah anda pasti ingin menjalankan atur cara ini?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Tidak dapat memulakan Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Tidak dapat memulakan gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 
@@ -3792,24 +3841,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Ringkasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Huraian mengandungi"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Ulasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Huraian mengandungi"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Tidak padan"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3839,7 +3894,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3861,75 +3916,75 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Temu janji baru"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Temu janji"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "M_esyuarat"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Wujudkan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Temu Janji Baru Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Temu Janji _Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendar:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Wujudkan kalendar baru"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4063,7 +4118,7 @@ msgstr "jam"
 msgid "minutes"
 msgstr "minit"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4136,7 +4191,7 @@ msgid "hour(s)"
 msgstr "jam"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minit"
 
@@ -4147,7 +4202,7 @@ msgstr "temu janji bermula"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Dibolehkan"
 
@@ -4199,7 +4254,7 @@ msgstr "30 minit"
 msgid "60 minutes"
 msgstr "60 minit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Berjaga-jaga"
 
@@ -4224,7 +4279,7 @@ msgid "Days"
 msgstr "Hari"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Bo_lehkan"
 
@@ -4367,7 +4422,7 @@ msgid "_Fri"
 msgstr "_Jumaat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Am"
 
@@ -4471,7 +4526,7 @@ msgstr ""
 "sini."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Senarai Tugas"
@@ -4651,23 +4706,23 @@ msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
 msgid "Validation error: %s"
 msgstr "Ralat pengesahan: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " kepada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr "(Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Genap Tempoh "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Genap Tempoh"
 
@@ -4703,8 +4758,8 @@ msgstr "Entri jurnal - %s"
 msgid "No summary"
 msgstr "Tiada ringkasan"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Simpan sebagai..."
 
@@ -4734,11 +4789,21 @@ msgstr "Tidak dapat batalkan pengendalian"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Pilih destinasi untuk folder ini disalin"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendar"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Senarai Tugas"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4841,7 +4906,7 @@ msgstr "Ditugaskan Kepada:"
 msgid "Enter Delegate"
 msgstr "Masukkan Ditugaskan"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Temu janji"
 
@@ -4865,23 +4930,32 @@ msgstr "Penjadualan"
 msgid "Meeting"
 msgstr "Mesyuarat"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Tarikh mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Tarikh akhir adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Masa mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Masa akhir adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kebenaran dinafikan untuk membuka kalendar"
@@ -4961,29 +5035,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Tiada"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Penyusun yang dipilih tidak lagi mempunyai akaun."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Penyusun diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Sekurang-kurangnya seorang peserta diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Ditugaskan Kepada..."
 
@@ -5182,7 +5256,7 @@ msgstr "semasa"
 msgid "occurrences"
 msgstr "kejadian"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Tarikh/Masa:"
@@ -5219,7 +5293,7 @@ msgid "_No recurrence"
 msgstr "_Tiada perulangan"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Keluarkan"
 
@@ -5261,7 +5335,7 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang dilakukan?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Buang Perubahan"
 
@@ -5285,7 +5359,7 @@ msgstr "Maklumat umpukan tugas telah diwujudkan. Hantar maklumat?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Maklumat tugas telah diubah. Hantar versi yang telah dikemas kini?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
 
@@ -5298,7 +5372,7 @@ msgstr "% _Selesai"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Selesai"
 
@@ -5311,7 +5385,7 @@ msgstr "Tinggi"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Sedang Dijalankan"
 
@@ -5330,7 +5404,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Tidak Dimulakan"
 
@@ -5370,16 +5444,16 @@ msgstr "Asas"
 msgid "Assignment"
 msgstr "Umpukan"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Tarikh genap tempoh adalah salah"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tidak dapat membuka buku alamat"
@@ -5390,7 +5464,7 @@ msgstr "Su_lit"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Huraian:"
 
@@ -5583,11 +5657,10 @@ msgstr "Tarikh Mula"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "warna"
 
@@ -5612,7 +5685,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5647,10 +5720,10 @@ msgstr "Tidak"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tak diketahui"
@@ -5663,99 +5736,105 @@ msgstr "Berulang"
 msgid "Assigned"
 msgstr "Diumpukkan"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Menghapuskan objek yang dipilih"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Mengemaskinikan objek"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Tampal"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Siarkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Buka"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Salin"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Sampaikan sebagai iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Hapuskan Kejadian _ini"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Hapuskan _Semua Kejadian"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Seting..."
 
@@ -5842,7 +5921,7 @@ msgid "Alarms"
 msgstr "Penggera"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Siap"
 
@@ -5900,26 +5979,26 @@ msgstr "%02i bahagian minit"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "petang"
@@ -6102,7 +6181,7 @@ msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Batal"
@@ -6557,12 +6636,12 @@ msgstr "Keutamaan:"
 msgid "Web Page:"
 msgstr "Laman Web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klik untuk menambahkan tugas"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6572,7 +6651,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6580,12 +6659,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Tugas permulaan pada %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6594,29 +6673,39 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Memuatkan Imej"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Tiada temu janji."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Buka dalam %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6735,16 +6824,16 @@ msgstr "Maklumat Bebas/Sibuk (%s hingga %s)"
 msgid "iCalendar information"
 msgstr "Maklumat iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Anda mestilah peserta peristiwa itu."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6752,7 +6841,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6760,12 +6849,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6954,49 +7043,49 @@ msgstr "Bulan yang dipilih (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Tahun yang dipilih (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Tugas"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Keutamaan: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Peratus Siap: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategori: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kenalan: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Pralihat Cetakan"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Item Cetakan"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Persediaan Cetakan"
 
@@ -7005,39 +7094,39 @@ msgstr "Persediaan Cetakan"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Tugas"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Wujudkan tugas baru"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Wujudkan tugas baru"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7094,20 +7183,20 @@ msgstr "Fail iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Fail vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Buang temu janji dan mesyuarat lama"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Peringatan!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Peristiwa Kalendar"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7115,7 +7204,7 @@ msgstr ""
 "Evolution telah menjumpai fail Kalendar Gnome.\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Kalendar Gnome"
 
@@ -8778,7 +8867,7 @@ msgstr "Tidak dapat membuka mesej"
 msgid "Failed on message %d"
 msgstr "Gagal pada mesej %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Menyegerakkan folder"
 
@@ -8863,7 +8952,7 @@ msgstr "Menyalin mesej"
 msgid "Filtering new message(s)"
 msgstr "Menapis mesej baru"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8874,15 +8963,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Gagal menghuraikan petunjuk id pengguna gpg."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Gagal menghuraikan permintaan ungkapan laluan gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8891,30 +8980,26 @@ msgstr ""
 "Anda memerlukan ungkapan laluan untuk membuka kunci bagi\n"
 "pengguna:  \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Batal."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Tiada data diberikan"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Gagal untuk menyulitkan: Penerima sah tidak ditetapkan."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8925,34 +9010,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Gagal untuk GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Gagal melaksanakan gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Gagal melaksanakan gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -8961,29 +9046,29 @@ msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Kandungan badan indeks"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Tidak dapat menghuraikan kandungan mesej"
 
@@ -9094,22 +9179,35 @@ msgstr "Gagal menyahsulitkan bahagian MIME: struktur tak sah"
 msgid "parse error"
 msgstr "ralat hurai"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Penyedia e-mel folder maya"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Untuk membaca mel sebagai pertanyaan bagi set folder yang lain"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Tidak dapat memuatkan %s: Pemuatan modul tidak disokong dalam sistem ini."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Tidak dapat memuatkan %s %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Tidak dapat memuatkan %s: Tiada kod pengawalan dalam modul."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Tidak ada penyedia bagi protokol `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Tanpa nama"
@@ -9272,7 +9370,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Maklum balas pengesahan yang salah daripada pelayan."
 
@@ -9412,20 +9510,7 @@ msgstr "Carian hos gagal: hos tidak dijumpai"
 msgid "Host lookup failed: unknown reason"
 msgstr "Carian hos gagal: sebab tak diketahui"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Penyedia e-mel folder maya"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Untuk membaca mel sebagai pertanyaan bagi set folder yang lain"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Tidak ada penyedia bagi protokol `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9488,21 +9573,25 @@ msgstr "Penandatangan: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Tidak dapat memperoleh folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Sampah"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9735,21 +9824,31 @@ msgstr "Tiada mesej %s tersebut dalam %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9766,15 +9865,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Gunakan penapis bagi mesej baru dalam INBOX dalam pelayan ini"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Secara automatik segerakkan mel jauh secara setempat"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Buku Alamat"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9794,44 +9888,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Kata laluan"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
 "teks biasa."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Piawai"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Kabut yang tebal"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Pengendalian dibatalkan"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Pelayan terputus tanpa dijangkakan: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9840,26 +9932,26 @@ msgstr ""
 "Isyarat daripada pelayan IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Maklum balas pelayan berhenti terlalu awal."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Maklum balas pelayan IMAP tidak mengandungi %s maklumat"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Maklum balas OK yang tidak dijangkakan daripada pelayan IMAP: %s"
@@ -9874,7 +9966,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder dimusnahkan dan diwujudkan semula dalam pelayan."
 
@@ -9883,12 +9975,12 @@ msgstr "Folder dimusnahkan dan diwujudkan semula dalam pelayan."
 msgid "Scanning for changed messages"
 msgstr "Mengimbas mesej yang diubah"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Tidak boleh mendapatkan semula mesej: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9904,25 +9996,25 @@ msgstr ""
 "Tidak boleh mendapatkan mesej: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Mesej ini tidak ada pada masa ini"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Mengambil maklumat ringkasan bagi mesej baru"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Tidak dapat mencari badan mesej dalam maklum balas FETCH."
 
@@ -9980,27 +10072,37 @@ msgstr "Ruang nama"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Gunakan penapis bagi mesej baru dalam INBOX dalam pelayan ini"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Menyemak mesej baru dalam semua folder"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Menyemak mesej baru dalam semua folder"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Pelayan IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Khidmat IMAP bagi %s pada %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10009,64 +10111,64 @@ msgstr "Khidmat IMAP bagi %s pada %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Rundingan SSL gagal"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Anda tidak memasukkan kata laluan."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10077,24 +10179,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder tersebut tidak ada%s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Nama folder \"%s\" tak sah kerana ia mengandungi aksara \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Folder ibu tak diketahui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder ibu tidak dibenarkan mengandungi subfolder"
 
@@ -10119,7 +10229,7 @@ msgstr ""
 "\n"
 " !!!JANGAN GUNAKAN INI UNTUK EMEL PENGELUARAN\t!!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Tidak dapat disambungkan ke pelayan POP pada %s"
@@ -10202,8 +10312,8 @@ msgstr ""
 "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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10215,55 +10325,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Simpanan setempat tidak mempunyai kotak masuk"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fail mel setempat %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Tidak dapat menamakan semula '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Tidak dapat menghapuskan fail ringkasan folder `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Tidak dapat menyimpan ringkasan: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Tidak dapat menambahkan mesej ke ringkasan: sebab tak diketahui"
 
@@ -10281,53 +10391,44 @@ msgstr "Tidak dapat menambahkan mesej pada folder dirmel: %s: %s"
 msgid "Invalid message contents"
 msgstr "Kandungan mesej tak sah"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Tidak dapat membuka folder `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Folder `%s' tidak wujud."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Tidak dapat mewujudkan folder `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' bukan direktori dirmel."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Tidak dapat menghapuskan folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "Bukan direktori dirmel"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10349,9 +10450,9 @@ msgid "Checking for new messages"
 msgstr "Menyemak mesej baru"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Menyimpan folder"
@@ -10395,157 +10496,135 @@ msgstr "Folder rosak dan tidak dapat dipulihkan."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Binaan mesej gagal: Peti mel rosak?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Tidak dapat membuka fail `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Tidak dapat mewujudkan folder dengan nama ini"
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Tidak dapat mewujudkan direktori '%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Tidak dapat melampirkan fail %s: bukan fail biasa"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Tidak dapat mewujudkan fail `%s':\n"
+"Tidak dapat menghapuskan folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' bukan fail biasa."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Tidak dapat menghapuskan folder `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' tidak kosong. Tidak dihapuskan."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Tidak dapat mewujudkan folder dengan nama ini"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Tidak dapat mewujudkan direktori '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID objek telah wujud"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Nama folder baru tidak sah."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Tidak dapat menamakan semula '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Tidak dapat menamakan semula %s ke %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Tidak dapat membuka folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ralat mati penghurai mel berdekatan kedudukan %ld dalam folder %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Tidak dapat menyemak folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tidak dapat membuka fail: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Tidak dapat membuka peti mel sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Tidak dapat menutup folder sumber %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Tidak dapat menutup folder sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Tidak dapat menamakan semula folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ringkasan dan folder tidak padan, walaupun selepas penyegerakan"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ralat tak diketahui: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Tidak dapat menyimpan folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ralat ketika menulis ke peti mel sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Gagal menulis ke peti mel sementara: %s: %s"
@@ -10559,10 +10638,17 @@ msgstr "Mesej tambahan MH dibatalkan"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Tidak dapat mewujudkan folder `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' bukan direktori."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10584,6 +10670,29 @@ msgstr "Spul `%s' bukan fail atau direktori biasa"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder `%s/%s' tidak wujud."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Tidak dapat membuka folder `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Folder `%s' tidak wujud."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Tidak dapat mewujudkan folder `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10818,47 +10927,47 @@ msgstr "Tidak dapat menamakan semula folder %s ke %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Tidak dapat mengalihkan folder ke dalam salah satu turunannya."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Ralat tak diketahui: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Folder tersebut tidak ada: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Tidak boleh mendapatkan kumpulan: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Tidak dapat menghantar mesej: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Arahan NNTP gagal: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mengimbas mesej baru"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Maklum balas pelayan tak diketahui: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Penggunaan batal"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Pengendalian gagal: %s"
@@ -10905,7 +11014,7 @@ msgstr "Hapuskan selepas %s hari"
 msgid "Disable support for all POP3 extensions"
 msgstr "Melumpuhkan sokongan untuk semua sambungan POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10996,7 +11105,7 @@ msgid "No such folder `%s'."
 msgstr "Folder tersebut tidak ada `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Hantar mel"
 
@@ -11051,7 +11160,7 @@ msgstr "hantarkan mel"
 msgid "Mail delivery via the sendmail program"
 msgstr "Penyerahan mel melalui atur cara hantar mel"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11221,7 +11330,7 @@ msgstr "Penghantaran mel SMTP melalui %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Tidak dapat menghantar mesej: alamat penghantar tak sah."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Menghantar mesej"
 
@@ -11327,34 +11436,34 @@ msgstr "Permintaan QUIT tamat masa: %s"
 msgid "QUIT response error"
 msgstr "Ralat maklum balas QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "lampiran"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Keluarkan item yang dipilih daripada senarai lampiran"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Tambahkan lampiran..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Lampirkan fail ke mesej"
 
@@ -11472,19 +11581,19 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Attach file(s)"
 msgstr "Lampirkan fail"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11493,30 +11602,30 @@ msgstr ""
 "Ralat ketika membaca fail %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fail wujud, tulis ganti?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ralat ketika menyimpan fail: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ralat ketika memuatkan fail: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Ralat ketika mencapai fail: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11525,7 +11634,7 @@ msgstr ""
 "Tidak dapat menjangkau fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11534,7 +11643,7 @@ msgstr ""
 "Tidak dapat memangkas fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11543,7 +11652,7 @@ msgstr ""
 "Tidak dapat menyalin penghurai fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11552,7 +11661,7 @@ msgstr ""
 "Ralat ketika menyimpan mesej secara automatik: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11562,7 +11671,7 @@ msgstr ""
 "sebelumnya.\n"
 "Adakah anda ingin cuba memulihkannya?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11573,43 +11682,43 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang telah dibuat?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Amaran: Mesej yang Diubah Suai"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Buka fail"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Tandatangan:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Gubah mesej"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11617,7 +11726,7 @@ msgstr ""
 "Tidak dapat mewujudkan tetingkap penggubah:\n"
 "Tidak dapat mengaktifkan kawalan pemilih alamat."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11629,7 +11738,7 @@ msgstr ""
 "Sila pastikan versi gtkhtml dan libgtkhtml\n"
 "yang betul dipasang.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11637,7 +11746,7 @@ msgstr ""
 "Tidak dapat mewujudkan tetingkap penggubah:\n"
 "Tidak dapat mengaktifkan komponen editor HTML."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11992,7 +12101,7 @@ msgstr "Kemudian"
 msgid "You must specify a folder."
 msgstr "Anda mestilah menetapkan folder."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Pilih Folder"
@@ -12007,19 +12116,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Penting"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Perkara yang Perlu Dibuat"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Selepas itu"
 
@@ -12107,7 +12216,7 @@ msgstr ""
 "Tarikh mesej akan dibandingkan dengan\n"
 "masa sekarang bila penapisan berlaku."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Folder Maya"
 
@@ -12123,7 +12232,7 @@ msgstr "yang lalu"
 msgid "months"
 msgstr "bulan"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "saat"
 
@@ -12293,7 +12402,7 @@ msgstr "tidak ditandai"
 msgid "Junk Test"
 msgstr "Jun"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12401,9 +12510,10 @@ msgstr "bermula dengan"
 msgid "Stop Processing"
 msgstr "Hentikan Memproses"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Tajuk"
 
@@ -12411,25 +12521,25 @@ msgstr "Tajuk"
 msgid "Unset Status"
 msgstr "Batalkan Set Status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Tajuk peraturan '%s' tidak unik, pilih yang lain."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Peraturan"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Tambahkan Peraturan"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Edit Peraturan"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Tajuk peraturan"
 
@@ -12469,16 +12579,16 @@ msgstr "Tajuk mengandungi"
 msgid "Subject does not contain"
 msgstr "Tajuk tidak mengandungi"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Anda mestilah menamakan vfolder ini."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 "Anda mestilah menetapkan sekurang-kurangnya satu folder sebagai sumber."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Sumber VFolder"
 
@@ -12530,9 +12640,9 @@ msgstr "Pemandang folder Mel Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Kawalan keutamaan Mel Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Mel"
 
@@ -12540,7 +12650,7 @@ msgstr "Mel"
 msgid "Mail Accounts"
 msgstr "Akaun Mel"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Keutamaan Mel"
 
@@ -12578,15 +12688,15 @@ msgstr "Anda mestilah menetapkan nama skrip yang sah."
 msgid "[script]"
 msgstr "[skrip]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Bahasa"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Tambahkan tandatangan skrip"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Tandatangan"
 
@@ -12671,7 +12781,6 @@ msgid "Unread messages"
 msgstr "Mesej _Belum Dibaca Seterusnya"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik di sini untuk memilih folder>"
 
@@ -12679,309 +12788,327 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Create New Folder"
 msgstr "Wujudkan Folder Baru"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Nama _folder:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Atas komputer ini"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolder"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Kotak masuk"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Sedang memuatkan..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Pilih folder"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Wujudkan folder"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Tidak dapat menghapuskan folder: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Hapuskan \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Namakan semula folder \"%s\" kepada:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Namakan semula Folder"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Buka dalam Tetingkap _Baru"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Alih"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Folder Baru..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Namakan semula"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ciri-ciri..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Piawai"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Pautan"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik untuk menambahkan tugas"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Padanan: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Diumpukkan"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Tandatangan buruk"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
+"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Tandatangan buruk"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -12990,85 +13117,85 @@ msgstr ""
 "Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
 "dapat disah betul."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Disampuk"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Kandungan badan indeks"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Penyulitan PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Kandungan badan indeks"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Sijil"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sijil masih belum sah"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "oleh %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Terlewat"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "oleh %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Lihat Dalam Talian"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Sembunyikan"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Halaman %d daripada %d"
@@ -13111,29 +13238,34 @@ msgstr "Penuding ke data luaran yang tak diketahui (jenis \"%s\")"
 msgid "Formatting message"
 msgstr "Memformat mesej"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Daripada"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "St"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Pengemel"
 
@@ -13147,8 +13279,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13165,20 +13297,25 @@ msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Format tandatangan yang tidak disokong"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13190,56 +13327,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Gagal untuk cache %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Gagal untuk cache %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Gagal mewujudkan saluran bagi '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Gagal menyelesaikan hos `%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mesej Tak Berjudul"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
@@ -13287,17 +13424,17 @@ msgstr "Penapis"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesej Yang Disampaikan --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13306,7 +13443,7 @@ msgstr ""
 "Tidak dapat menyimpan dalam `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13315,30 +13452,36 @@ msgstr ""
 "`%s' telah wujud.\n"
 "Tulis gantinya?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "mesej"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fail '%s' tidak wujud atau bukan fail biasa."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Simpan Mesej..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Alamat"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mel dari %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tidak dapat mewujudkan direktori sementara: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13353,7 +13496,7 @@ msgstr ""
 "\n"
 "Anda pasti ingin menghapuskan mesej ini?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13383,211 +13526,225 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Tajuk piawai bagi mesej."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Tajuk piawai bagi mesej."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Cari teks dalam badan mesej yang dipaparkan"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Cari teks dalam badan mesej yang dipaparkan"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "_Gaya untuk menyampaikan:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Tajuk piawai bagi mesej."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Tajuk piawai bagi mesej."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "_Gaya Balasan:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Akaun Mel"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Melaksanakan tindakan"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13595,108 +13752,102 @@ msgid ""
 msgstr ""
 "_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Hantar Mel HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Hantar Mel HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Tunjukkan imej animasi"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Tunjukkan imej animasi"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Tunjukkan mesej dalam gaya normal"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Pralihat Anak Tetingkap"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Mainkan fail bunyi apabila ada mel baru"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Semak _Ejaan"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Fon Terminal:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13704,172 +13855,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Senarai Mesej yang Disambungkan"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Senarai Mesej yang Disambungkan"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Jadikan ini akaun piawai saya"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "L_ebar Pemboleh ubah:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Pengimport Elm Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Pengimport peti mel Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "Peti Mel (peti mel)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Pengimport Pine Evolution"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sedang mengimport mel Elm lama anda"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Sedang mengimport..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Sila tunggu"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Mengimport %s sebagai %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Mengimbas %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Mengimport Fail"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13877,16 +14025,44 @@ msgstr ""
 "Evolution telah menjumpai fail mel Elm\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Hapuskan folder ini"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Mengimport"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Mengimport Fail"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Mengimbas %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Penapis Keutamaan \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13913,7 +14089,7 @@ msgstr ""
 "keutamaan. Semak penapis yang diimport untuk memastikan\n"
 "segalanya berfungsi seperti yang diinginkan."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13925,7 +14101,7 @@ msgstr ""
 "yang tidak disokong dalam Evolution.\n"
 "Penapis ini akan digugurkan."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13939,31 +14115,24 @@ msgstr ""
 "diubah suai untuk menguji sama ada rentetan itu terkandung\n"
 "dalam badan mesej atau tidak."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Mengimbas penapis mel"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Mengimbas direktori"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Memulakan import"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Seting"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Penapis Mel"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13971,11 +14140,20 @@ msgstr ""
 "Evolution telah menjumpai fail mel Netscape.\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution sedang mengimport data Pine lama anda"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Mengimport Fail"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Buku Alamat"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13983,7 +14161,7 @@ msgstr ""
 "Evolution telah menjumpai fail mel Pine.\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14026,19 +14204,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Anda tidak mengisi semua maklumat yang diperlukan."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor Akaun Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Hos:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Nama_pengguna:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Laluan:"
 
@@ -14090,28 +14268,43 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Anda mempunyai mesej yang belum dihantar, anda tetap ingin keluar?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "VFolder Baru"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Penapis Mel"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Wujudkan kalendar baru"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Pengenalan"
 
@@ -14153,7 +14346,7 @@ msgstr ""
 "Sila masukkan maklumat tentang cara anda menghantar mel. Jika anda tidak "
 "pasti, tanya pentadbir sistem anda atau Penyedia Khidmat Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Pengurusan Akaun"
 
@@ -14180,123 +14373,118 @@ msgid "Connecting to server..."
 msgstr "Sedang disambungkan ke pelayan..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Semak jenis sokongan "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL tidak disokong dalam binaan Evolution ini)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL tidak disokong dalam binaan Evolution ini)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "S_entiasa sulitkan kepada saya sendiri semasa menghantar mel yang disulitkan"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Editor Akaun"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Maklumat Akaun"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Tambahkan Sk_rip"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Tambahkan tandatangan baru..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Sen_tiasa sulitkan kepada saya sendiri semasa menghantar mel yang disulitkan"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sentiasa buat _salinan tersembunyi (St) kepada:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sentiasa buat _salinan (Sk) kepada:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sentiasa _tekan kekunci dalam gelang kekunci saya semasa menyulitkan"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Lampirkan mesej asal"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Lampiran"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Pengesahan"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "S_et aksara:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "W_arna"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Semak ejaan sambil saya _menaip"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Warna bagi _kata yang salah eja:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Menggubah Mesej"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14312,143 +14500,139 @@ msgstr ""
 "\n"
 "Klik \"Guna\" untuk menyimpan seting anda."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Pia_wai"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Peri laku Piawai"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Pengekodan aksara _piawai:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Menghapuskan Mel"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Jangan petik mesej asal"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Jangan tandatangani _permintaan mesyuarat (bagi keserasian Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Selesai"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Folder _draf:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Akaun E-mel"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Alamat _e-mel:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Sijil Kenalan"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Pembantu Akaun Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Laksanakan Arahan..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Le_bar -tetap:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Penapis"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Ciri-ciri Fon"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatkan mesej dalam _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Pengepala"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Tonjolkan _petikan dengan"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Dalam Talian"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Label dan Warna"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Memuatkan Imej"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Konfigurasi Mel"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Lokasi peti mel"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Penggubah Mesej"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Paparan Mesej"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Fon Mesej"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14456,140 +14640,140 @@ msgstr ""
 "Nota: anda tidak akan digesa untuk memberikan kata laluan sehinggalah anda "
 "disambungkan buat pertama kali"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Maklumat Opsyenal"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisasi:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _ID Kekunci:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pilih warna"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Kebersendirian Agak Baik (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Fon Tercetak"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Dirmel Qmail "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Petik mesej asal"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Dipetik"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "I_ngat kata laluan ini"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Jawapan Kepada:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Menerima E-mel"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Menerima _Opsyen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Ingat kata laluan _ini"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Maklumat yang Diminta"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Simpan semula Piawai"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "K_eselamatan"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Terjamin (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Pilih fon lebar tetap HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Pilih fon lebar tetap HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Pilih fon lebar pemboleh ubah HTML"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Menghantar E-mel"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Folder _mesej Dihantar:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mesej Dihantar dan Didraf"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Pe_layan memerlukan pengesahan"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Konfigurasi Pelayan"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Jenis _Pelayan:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Sijil tandatangan tidak dijumpai"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Tetapkan _nama fail:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Semak _Ejaan"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Peti mel Unix piawai"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14599,7 +14783,7 @@ msgstr ""
 "anda. Nama yang anda tetapkan akan digunakan\n"
 "untuk tujuan paparan sahaja. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14609,7 +14793,7 @@ msgstr ""
 "semakan ejaan. Senarai bahasa di sini hanya menunjukkan bahasa yang terdapat "
 "dalam kamus yang telah dimasukkan."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14617,15 +14801,15 @@ msgstr ""
 "Taip nama yang ingin anda gunakan bagi akaun ini.\n"
 "Contohnya: \"Kerja\" or \"Peribadi\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "L_ebar Pemboleh ubah:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14635,175 +14819,175 @@ msgstr ""
 "\n"
 "Klik \"Sampaikan\" untuk bermula. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Tambahkan Tandatangan"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Sentiasa muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Jenis Pengesahan:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Jenis Pengesahan:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Secara automatik semak mel baru setiap"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Secara automatik sisipkan imej smiley"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Bunyi bip apabila ada mesej baru"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Sahkan apabila membuang folder"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Tandatangan piawai:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Piawai"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Jangan beritahu saya apabila ada mel baru"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Bolehkan"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Gaya untuk menyampaikan:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Nama penuh:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_Mel HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Pengenalan"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Jun"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Muatkan imej jika penghantar ada dalam buku alamat"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Jadikan ini akaun piawai saya"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Tandakan mesej sebagai telah dibaca selepas"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Jangan muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Mainkan fail bunyi apabila ada mel baru"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Penggesa tapabila menghantar mesej tanpa tajuk"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Menerima Mel"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Gaya Balasan:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Simpan semula piawai"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skrip:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "_Hapuskan..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Menghantar Mel"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Tunjukkan imej animasi"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Tandatangan"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Fon Piawai:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Fon Terminal:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Gunakan sambungan terjamin (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Gunakan fon yang sama seperti aplikasi lain"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "huraian"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s berdenting"
@@ -14826,7 +15010,7 @@ msgstr ""
 "Ralat semasa melakukan pengendalian:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Berfungsi"
 
@@ -14838,12 +15022,12 @@ msgstr "Menapis Folder"
 msgid "Fetching Mail"
 msgstr "Mengambil Mel"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Gagal menggunakan penapis luaran: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14852,116 +15036,116 @@ msgstr ""
 "Gagal untuk menambah ke %s: %s\n"
 "Sebagai ganti menambah ke folder 'Hantar' setempat."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Gagal untuk menambah ke folder 'Hantar' setempat: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Menghantar \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Menghantar mesej %d daripada %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Gagal pada mesej %d daripada %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Selesai."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Menyimpan mesej ke folder"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Membuka simpanan %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Memuatkan semula folder"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Membuang folder"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Mengosongkan tong sampah dalam '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mendapatkan semula mesej %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mendapatkan semula %d mesej"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Menyimpan %d mesej"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14970,7 +15154,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14979,11 +15163,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14992,22 +15176,22 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15042,38 +15226,38 @@ msgstr "Pengecualian"
 msgid "Security Information"
 msgstr "Maklumat Akaun"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Sedang membatalkan..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Pelayan: %s, Jenis: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Laluan: %s, Jenis: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Jenis: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Hantarkan dan Terima Mel"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Batalkan _Semua"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Sedang mengemaskinikan..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
@@ -15182,20 +15366,20 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Cuba mengedit vFolder '%s' yang tidak wujud."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
@@ -15525,97 +15709,20 @@ msgstr "Folder Luar Talian"
 msgid "Autocompletion Folders"
 msgstr "Folder Autocompletion"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Tidak dapat menyalin folder: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Tidak dapat mengalihkan folder: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Tidak dapat mengalihkan folder atas folder itu sendiri."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Tidak dapat menyalin folder atas folder itu sendiri."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Tidak dapat mengalihkan folder ke dalam salah satu turunannya."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Tentukan folder untuk menyalin folder \"%s\" ke dalam:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Salin Folder"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Tentukan folder untuk mengalihkan folder \"%s\" ke dalam:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Alihkan Folder"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Tidak dapat menghapuskan folder:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Anda pasti ingin menghapuskan folder \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Tidak dapat menamakan semula folder:\n"
+"Tidak dapat mewujudkan folder yang ditetapkan:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Nama folder yang ditetapkan tak sah: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Folder yang dipilih bukannya milik pengguna yang lain"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Tidak dapat mengeluarkan folder:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Tidak dapat mewujudkan folder yang ditetapkan:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Tak Berjudul)"
@@ -15755,7 +15862,7 @@ msgstr "Gagal melaksanakan gpg."
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Sedang menutup sambungan..."
 
@@ -15793,6 +15900,10 @@ msgstr "Tidak dapat membuka folder kongsi: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Tidak dapat mencari folder kongsi yang ditetapkan."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Memulakan import"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15906,125 +16017,6 @@ msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 msgid "Generic error"
 msgstr "Ralat generik"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Wujudkan Kumpulan Jalan Pintas Baru"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nama kumpulan:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Adakah anda benar-benar ingin mengeluarkan kumpulan \"%s\" daripada bar "
-"jalan pintas?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Namakan semula Kumpulan Jalan Pintas"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Namakan semula kumpulan jalan pintas yang dipilih kepada:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Ikon Kecil"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Tunjukkan jalan pintas sebagai ikon kecil"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Ikon Besar"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Tunjukkan jalan pintas sebagai ikon besar"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Tambahkan Kumpulan..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Wujudkan kumpulan jalan pintas baru"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Keluarkan Kumpulan ini..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Keluarkan kumpulan jalan pintas ini"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Na_makan semula Kumpulan ini..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Namakan semula kumpulan jalan pintas ini"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Sembunyikan Bar Jalan Pintas"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Sembunyikan bar jalan pintas"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Wujudkan _Jalan Pintas Piawai"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Wujudkan Jalan Pintas Piawai"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Namakan Semula Jalan Pintas"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Namakan semula jalan pintas yang dipilih kepada:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Buka folder yang dipautkan ke jalan pintas ini"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Buka dalam Tetingkap _Baru"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Buka folder yang dipautkan ke jalan pintas ini dalam tetingkap baru"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Namakan semula jalan pintas ini"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Ke_luarkan"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Keluarkan jalan pintas ini daripada bar jalan pintas"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Ralat ketika menyimpan jalan pintas."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Jalan pintas"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kotak semak"
@@ -16035,11 +16027,6 @@ msgstr "Kotak semak"
 msgid "New"
 msgstr "Baru"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" dalam \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16343,55 +16330,55 @@ msgstr ""
 "%s: --dalam talian dan --luar talian tidak dapat digunakan bersama.\n"
 "  Gunakan %s --bantuan untuk keterangan lanjut.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Pilih pengimport"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Nama Sijil"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Tujuan"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Nombor Siri"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Tamat tempoh"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Alamat E-mel"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Masukkan Kata Laluan bagi %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16452,7 +16439,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "Sijil"
@@ -16520,11 +16507,11 @@ msgstr "Unit Organisasi (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Cap jari SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "Sijil Pelanggan SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "Sijil Pelayan SSL"
 
@@ -16571,241 +16558,241 @@ msgstr "Anda mempunyai sijil pada fail yang mengecam orang-orang ini:"
 msgid "Your Certificates"
 msgstr "Sijil Anda"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID Kenalan telah wujud"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Nama Sijil"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Nama Sijil"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sijil tak dipercayai"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Tajuk adalah %s "
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Tidak dapat memproses folder spul"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Kuasa Sijil Tak Sah (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Kuasa Sijil Tak Sah (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Tiada Maklumat"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "lampiran"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Nama Sijil"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Carolina Utara"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Ungkapan"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s semasa %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Kegagalan tandatangan sijil"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "Dikeluarkan Pada"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 #, fuzzy
 msgid "Issuer Unique ID"
 msgstr "ID Unik"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "ID Unik"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Kegagalan tandatangan sijil"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "Sijil Anda"
@@ -17398,7 +17385,8 @@ msgid "_Threaded Message List"
 msgstr "_Senarai Mesej yang Disambungkan"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Tam_bahkan Penghantar ke Buku Alamat"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17406,7 +17394,8 @@ msgid "A_pply Filters"
 msgstr "G_unakan Penapis"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Tambahkan Penghantar ke Buku Alamat"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17855,10 +17844,6 @@ msgstr "For_mat"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Buka"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Buka fail"
@@ -18229,22 +18214,6 @@ msgstr "_Hantar / Terima"
 msgid "_Window"
 msgstr "_Cari Sekarang"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Cetak Ringkasan"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Cetak ringkasan"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Muat semula"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Muat semula pandangan"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Mengikut _Syarikat"
@@ -18305,8 +18274,8 @@ msgstr "Dengan _Kategori"
 msgid "_Tasks"
 msgstr "_Tugas"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18553,23 +18522,23 @@ msgstr "_Cari"
 msgid "_Find Now"
 msgstr "_Cari Sekarang"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Kosongkan"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID Item"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID Subitem"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Teks"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Cari Sekarang"
@@ -18584,6 +18553,210 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Sumber Buku Alamat"
+
+#~ msgid "No data provided"
+#~ msgstr "Tiada data diberikan"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat membuka fail `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat mewujudkan direktori '%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat mewujudkan fail `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' bukan direktori."
+
+#~ msgid "On this Computer"
+#~ msgstr "Atas komputer ini"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Mengimport %s sebagai %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Mengimbas penapis mel"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Mengimbas direktori"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Tidak dapat menyalin folder: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Tidak dapat mengalihkan folder: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Tidak dapat mengalihkan folder atas folder itu sendiri."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Tidak dapat menyalin folder atas folder itu sendiri."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Tidak dapat mengalihkan folder ke dalam salah satu turunannya."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Tentukan folder untuk menyalin folder \"%s\" ke dalam:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Salin Folder"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Tentukan folder untuk mengalihkan folder \"%s\" ke dalam:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Alihkan Folder"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat menghapuskan folder:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Anda pasti ingin menghapuskan folder \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat menamakan semula folder:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Folder yang dipilih bukannya milik pengguna yang lain"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat mengeluarkan folder:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Wujudkan Kumpulan Jalan Pintas Baru"
+
+#~ msgid "Group name:"
+#~ msgstr "Nama kumpulan:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Adakah anda benar-benar ingin mengeluarkan kumpulan \"%s\" daripada bar "
+#~ "jalan pintas?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Namakan semula Kumpulan Jalan Pintas"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Namakan semula kumpulan jalan pintas yang dipilih kepada:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Ikon Kecil"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Tunjukkan jalan pintas sebagai ikon kecil"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Ikon Besar"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Tunjukkan jalan pintas sebagai ikon besar"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Tambahkan Kumpulan..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Wujudkan kumpulan jalan pintas baru"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Keluarkan Kumpulan ini..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Keluarkan kumpulan jalan pintas ini"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Na_makan semula Kumpulan ini..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Namakan semula kumpulan jalan pintas ini"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Sembunyikan Bar Jalan Pintas"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Sembunyikan bar jalan pintas"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Wujudkan _Jalan Pintas Piawai"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Wujudkan Jalan Pintas Piawai"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Namakan Semula Jalan Pintas"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Namakan semula jalan pintas yang dipilih kepada:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Buka folder yang dipautkan ke jalan pintas ini"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Buka dalam Tetingkap _Baru"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Buka folder yang dipautkan ke jalan pintas ini dalam tetingkap baru"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Namakan semula jalan pintas ini"
+
+#~ msgid "Re_move"
+#~ msgstr "Ke_luarkan"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Keluarkan jalan pintas ini daripada bar jalan pintas"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Ralat ketika menyimpan jalan pintas."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Jalan pintas"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" dalam \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Cetak Ringkasan"
+
+#~ msgid "Print summary"
+#~ msgstr "Cetak ringkasan"
+
+#~ msgid "Reload"
+#~ msgstr "Muat semula"
+
+#~ msgid "Reload the view"
+#~ msgstr "Muat semula pandangan"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Salin ke folder..."
 
@@ -19195,24 +19368,9 @@ msgstr "%s (%d%% siap)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Senaraikan Tunjukkan Alamat"
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Pengimport LDIF Evolution"
-
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Kilang pengimport LDIF Evolution"
 
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "Format Saling Tukar Data LDAP (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Pengimport VCard Evolution"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Pengimport VCard Evolution"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Searching..."
 #~ msgstr "Sedang mencari..."
 
@@ -27324,9 +27482,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Appointments"
 #~ msgstr "Temu janji"
 
-#~ msgid "No appointments."
-#~ msgstr "Tiada temu janji."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27831,9 +27986,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Moderate mist"
 #~ msgstr "Kabut agak tebal"
 
-#~ msgid "Thick mist"
-#~ msgstr "Kabut yang tebal"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Kabut tidak tebal"
 
@@ -28364,9 +28516,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Wujudkan tetingkap baru yang memaparkan folder ini"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Hapuskan folder ini"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Paparkan folder yang berbeza"
 
diff --git a/po/nl.po b/po/nl.po
index 6961acb67d..39d94208db 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,14 +20,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-01 19:27+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-03-01 23:00+0100\n"
 "Last-Translator: Daniel van Eeden <daniel_e@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -59,7 +59,6 @@ msgstr "Hier kunt u auto-afmaken instellen"
 #. 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:363
@@ -104,20 +103,20 @@ msgstr "Evolution configuratie voor mapinstellingen"
 msgid "Manager your S/Mime certificates here"
 msgstr "Uw S/Mime certificaten hier beheren"
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:225
 #, 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-component.c:269
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Nieuw adresboek"
 
-#: addressbook/gui/component/addressbook-component.c:270
+#: addressbook/gui/component/addressbook-component.c:309
 #: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -125,61 +124,61 @@ msgstr "Nieuw adresboek"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Nieuw contact"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "C_ontact"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nieuwe contactenlijst"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Contacten_lijst"
 
 # een nieuwe contactenlijst aanmaken
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Maak een nieuwe contactenlijst"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Kan geen verbinding krijgen met LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Fout bij het aanmelden bij de LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Kan geen query uitvoeren op de Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "De server antwoordde zonder ondersteunde zoekbasis"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Fout bij het laden van schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
 
@@ -208,20 +207,18 @@ msgid "Migrating `%s':"
 msgstr "`%s' wordt overgezet:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Op deze computer"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -375,7 +372,7 @@ msgstr "Ondersteunde bases _weergeven"
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -422,7 +419,7 @@ msgid "Address Book Sources"
 msgstr "Adresboek bronnen"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Altijd"
 
@@ -481,7 +478,7 @@ msgid "Group:"
 msgstr "Groep:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nooit"
 
@@ -725,7 +722,7 @@ msgid "Using email address"
 msgstr "E-mail adres wordt gebruikt"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Indien mogelijk"
 
@@ -752,7 +749,7 @@ msgstr "_Downloadlimiet:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -1004,9 +1001,9 @@ msgstr "_Categorieën..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2200
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
 #: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -2099,7 +2096,7 @@ msgstr "Thuis"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Werk"
 
@@ -2460,13 +2457,13 @@ msgid "Email begins with"
 msgstr "E-mail begint met"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
@@ -2556,7 +2553,7 @@ msgstr "Knippen"
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:360
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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
@@ -2587,7 +2584,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1607
-#: calendar/gui/cal-search-bar.c:353
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Elke categorie"
 
@@ -3122,17 +3119,17 @@ msgstr "Kaartweergave"
 msgid "GTK Tree View"
 msgstr "GTK boomweergave"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr ""
 
-#: 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 ""
 
@@ -3258,7 +3255,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opties"
 
@@ -3437,7 +3434,7 @@ msgstr "Geen bestandsnaam opgegeven."
 msgid "Unnamed List"
 msgstr "Lijst van onbenoemden"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
 #: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Wachtwoord invoeren"
@@ -3516,7 +3513,7 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution taken-component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3774,23 +3771,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Week_nummers tonen in datum navigatie"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Samenvatting bevat"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Omschrijving bevat"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Omschrijving bevat"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Niet passend"
 
 #: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3818,10 +3822,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:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -3845,70 +3845,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nieuwe agenda"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Ver_gadering"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Nieuwe kalender"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe agenda aan"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4040,7 +4040,7 @@ msgstr "uren"
 msgid "minutes"
 msgstr "minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4113,7 +4113,7 @@ msgstr "u(u)r(en)"
 
 # meervoudsvorm?
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -4174,7 +4174,7 @@ msgstr "30 minuten"
 msgid "60 minutes"
 msgstr "60 minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Waarschuwingen"
 
@@ -4199,7 +4199,7 @@ msgid "Days"
 msgstr "Dagen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Aanzetten"
 
@@ -4339,7 +4339,7 @@ msgid "_Fri"
 msgstr "_Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Algemeen"
 
@@ -4839,23 +4839,31 @@ msgstr "Bijeenkomstplannen"
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Einddatum is fout"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Begintijd is ongeldig"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Eindtijd is fout"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Toegang geweigerd bij openen van de kalender"
@@ -4929,36 +4937,31 @@ msgid "_Start time:"
 msgstr "_Begintijd:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "De geselecteerde organisator heeft geen account meer."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Overdragen aan..."
 
@@ -5149,7 +5152,7 @@ msgstr "op de"
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Datum/Tijd"
 
@@ -5182,7 +5185,7 @@ msgid "_No recurrence"
 msgstr "_Geen herhaling"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Verwijderen"
 
@@ -5248,7 +5251,7 @@ msgstr "De taakopdracht informatie is gemaakt. Verzenden?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "De taakgegevens zijn veranderd. De actuele versie verzenden?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Voltooiingsdatum is ongeldig"
 
@@ -5333,16 +5336,16 @@ msgstr "Basis"
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Voltooiingsdatum is incorrect"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan taken in '%s' niet openen."
@@ -5353,7 +5356,7 @@ msgstr "Vertrouwelijk"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -5540,7 +5543,7 @@ msgstr "Begindatum"
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "kleur"
 
@@ -5603,7 +5606,7 @@ msgstr "Nee"
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Onbekend"
@@ -5692,7 +5695,7 @@ msgstr "K_nippen"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5801,7 +5804,7 @@ msgid "Alarms"
 msgstr "Alarmen"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Voltooid"
 
@@ -5830,20 +5833,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5867,10 +5862,6 @@ msgstr "%02i minuten delingen"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5878,9 +5869,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-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6076,7 +6064,7 @@ msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
@@ -6442,10 +6430,6 @@ msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-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
@@ -6454,10 +6438,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:1606
 msgid "%m/%d/%Y"
@@ -6546,7 +6526,7 @@ msgstr "Website:"
 msgid "Click to open %s"
 msgstr "Klik hier om %s te openen"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6556,7 +6536,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6564,12 +6544,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6578,19 +6558,19 @@ msgstr ""
 "Fout bij openen %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Taken laden"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
@@ -6727,11 +6707,11 @@ msgstr "Vrij/Bezet informatie (%s tot %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informatie"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Voer uw wachtwoord in voor %s"
@@ -8800,7 +8780,7 @@ msgstr "Ongeldige argumenten voor (systeemvlag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ongeldige argumenten voor (gebruiker)"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -8890,7 +8870,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
@@ -9274,7 +9254,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -9494,11 +9474,11 @@ msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Troep"
@@ -9770,7 +9750,7 @@ 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"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automatisch controleren op nieuwe post, iedere"
@@ -9792,38 +9772,36 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Voor benadering van Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Standaard"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Dikke mist"
 
 #: 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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -9872,21 +9850,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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 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:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ophalen van bericht mislukt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9902,25 +9880,25 @@ msgstr ""
 "Kan bericht niet verkrijgen: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -9976,27 +9954,37 @@ msgstr "Naamruimte:"
 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"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Controleer op nieuwe berichten in alle mappen"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Controleer op nieuwe berichten in alle mappen"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-dienst voor %s op %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10005,64 +9993,64 @@ msgstr "IMAP-dienst voor %s op %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-onderhandelingen mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10073,13 +10061,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10087,18 +10075,18 @@ msgstr "Map `%s' bestaat niet."
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "De mapnaam \"%s\" is ongeldig omdat deze het teken \"%c\" bevat."
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende oudermap: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
@@ -10124,7 +10112,7 @@ msgstr ""
 "\n"
 " !!! GEBRUIK VOOR PRODUCTIE EMAIL WORDT ZEER STERK AFGERADEN  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kon niet verbinden met POP-server op %s"
@@ -10346,9 +10334,9 @@ msgid "Checking for new messages"
 msgstr "Bezig met controleren op nieuwe berichten"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Map wordt opgeslagen"
@@ -10453,75 +10441,75 @@ msgstr "Kon '%s' niet hernoemen: %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kon map: %s niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale e-mail analysefout op positie %ld in de map %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan map %s niet controleren: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kon bestand: %s niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijke postbus niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bronmap %s niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kon de map niet opslaan: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijke postbus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
@@ -10920,7 +10908,7 @@ msgstr "Verwijder na %s dag(en)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Ondersteuning voor POP3-extensies uitschakelen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11011,7 +10999,7 @@ msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11065,7 +11053,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11231,7 +11219,7 @@ msgstr "Postaflevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Bericht wordt verstuurd"
 
@@ -11339,34 +11327,34 @@ msgstr "Time-out tijdens QUIT-verzoek: %s"
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "bijlage"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Verwijder het geselecteerde bestand uit de lijst van bijlages"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
@@ -11610,7 +11598,9 @@ msgstr "Automatisch gegenereerd"
 #: composer/e-msg-composer.c:2263
 #, fuzzy, c-format
 msgid "<b>%d</b> File Attached"
-msgstr "<b>%d</b> Bestand bijgevoegd"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Bestand bijgevoegd"
+msgstr[1] "<b>%d</b> Bestand bijgevoegd"
 
 #: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
@@ -11814,16 +11804,12 @@ msgstr "Categorieën Actualiseren:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d-%m-%Y %H:%M:%S"
@@ -11875,31 +11861,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -12035,19 +12013,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Belangrijk"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Te doen"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Later"
 
@@ -12151,7 +12129,7 @@ msgstr "geleden"
 msgid "months"
 msgstr "maanden"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "seconden"
 
@@ -12565,7 +12543,7 @@ msgstr "Post"
 msgid "Mail Accounts"
 msgstr "E-mail accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "E-mailvoorkeuren"
 
@@ -12702,122 +12680,123 @@ msgstr "<klik hier om een map te selecteren>"
 msgid "Create New Folder"
 msgstr "Nieuwe map aanmaken"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Map_naam:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 
-#: mail/em-folder-tree.c:1760
+#: mail/em-folder-tree.c:1798
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 
-#: mail/em-folder-tree.c:1789 mail/em-folder-tree.c:1878
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1805 mail/em-folder-tree.c:1818
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
 #: mail/em-folder-view.c:660 mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Map aanmaken"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kon map %s niet verwijderen"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2094
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "De map \"%s\" en alle submappen echt verwijderen?"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" verwijderen"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "De \"%s\" map hernoemen naar:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: mail/em-folder-tree.c:2142
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Een map genaamd \"%s\" bestaat reeds. Gebruik een andere naam."
 
-#: mail/em-folder-tree.c:2188 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2189
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Open in _Nieuw Venster"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Verplaatsen"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: mail/em-folder-tree.c:2204 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
@@ -12951,6 +12930,12 @@ msgstr "Filter op _Mailinglijst"
 msgid "Filter on Thread"
 msgstr "Filter op afzen_der"
 
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Standaard"
+
 #: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Bericht afdrukken"
@@ -13169,7 +13154,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:739
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "E-mailprogramma"
 
@@ -13202,16 +13187,21 @@ msgstr "Kon S/MIME bericht niet verwerken: onbekende fout"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Encryptie type voor multipart/encrypted wordt niet ondersteund"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Niet ondersteund schema"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Onbekende fout bij het verifiëren van ondertekening"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Onbekende fout bij het verifiëren van ondertekening"
 
@@ -13227,22 +13217,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Bufferen van bericht %s mislukt: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Bufferen van bericht %s mislukt: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Aanmaken van pijp naar '%s' mislukt: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Kon computer '%s' niet vinden: %s"
@@ -13370,12 +13360,18 @@ msgstr "Bericht opslaan..."
 msgid "Add address"
 msgstr "Adres toevoegen"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Post ophalen van %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13388,7 +13384,7 @@ msgstr ""
 "\n"
 "Deze berichten echt verwijderen?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13414,230 +13410,226 @@ msgid "Check incoming mail being junk"
 msgstr "Controleer binnenkomende mail op troep"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Controleer binnenkomende mail in IMAP accounts op troep"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 #, fuzzy
 msgid "Composer Window default height"
 msgstr "Standaardhoogte berichtvenster"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
 msgid "Composer Window default width"
 msgstr "Standaardbreedte berichtvenster"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Standaardonderwerp van het bericht."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Standaardonderwerp van het bericht."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
 # manier van doorsturen
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Standaard doorstuurstijl"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
 msgstr "Standaardonderwerp van het bericht."
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Standaardonderwerp van het bericht."
 
 # standaard manier van antwoorden
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Standaard antwoordstijl"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Toont de mappenbalk"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Toont de mappenbalk"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Teken indicatoren voor verkeerd gespelde woorden als u typt."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Prullenbakken legen bij afsluiten"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Prullenbakken legen bij afsluiten"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Lijst met labels en de bijpassende kleuren"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Lijst met accounts"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 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:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:31
 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:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Laad afbeeldingen voor HTML berichten over http"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Acties uitvoeren"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
 # Logbestand waarin filteracties worden gelogt
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Logbestand voor filteracties"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Logbestand voor filteracties"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Markeer als gelezen na een bepaalde timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Markeer als gelezen ne een bepaalde tijd."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Standaardhoogte berichtvenster"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Standaardbreedte berichtvenster"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Berichtweergave stijl (normaal, volledige koppen, bron)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Nieuwe Mail Notificatie geluids bestand"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Nieuwe Mail Notificatie type"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Bericht bij een leeg onderwerp"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13646,110 +13638,102 @@ msgstr ""
 "_Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:53
 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:55
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Herkennen en vervangen van links in de text."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 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:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Test inkomende mail op troep"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Doe troep-test op binnenkomende mail voor IMAP accounts (enkel geldigals "
-"check_incoming is ingesteld op true)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Standaard HTLM e-mail versturen"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Standaard HTLM e-mail versturen."
 
 # filmpjes weergeven
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Bewegende afbeeldingen _weergeven"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Bewegende afbeeldingen _weergeven"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Verwijderde berichten (doorgestreept) tonen in de berichtenlijst."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Laat berichten in normale stijl zien"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Toon het voorbeeld paneel"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Het voorbeeld weergave paneel tonen."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Specificatie van het type notificatie bij nieuwe mail die de gebruiker wenst "
 "te gebruiken."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Spellings_controle"
 
 # console ipv terminal?
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Terminal-lettertype"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Het terminal lettertype voor mail weergave"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Kies HTML lettertype met variabele breedte voor afdrukken"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13758,111 +13742,111 @@ msgid ""
 msgstr ""
 
 # boomstructuur voor berichtenlijst
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Discussies tonen in berichtenlijst."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Discussies tonen in berichtenlijst"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "UID tekenreeks van de standaard account."
 
 # fout in engels: spamasssassin
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Spamassassin daemon en client gebruiken"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin daemon en client gebruiken (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Aangepaste lettertypen gebruiken"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Aangepaste lettertypen gebruiken voor berichtweergave"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Gebruik allen lokale spam testen."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Gebruik enkel locale spam testen (geen DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "V_ariabele breedte:"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 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:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "spamd poort"
 
@@ -13899,15 +13883,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is uw oude Elm mail aan het importeren"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importeren..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
@@ -13928,23 +13912,23 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Doel map:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Importeerder selecteren"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importeren `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Bezig met Importeren mailbox"
@@ -14101,15 +14085,15 @@ msgstr "U heeft niet alle informatie ingevuld die nodig is."
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pad:"
 
@@ -14161,28 +14145,43 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 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-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nieuwe VMap"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-mail filters"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Maak een nieuwe agenda aan"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identiteit"
 
@@ -14226,7 +14225,7 @@ 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:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Accountbeheer"
 
@@ -14253,124 +14252,119 @@ msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Ondersteunde aanmeldingstypes controleren"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Toon mail koppen</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Berichten naar _mijzelf altijd versleutelen bij het versturen van "
 "versleutelde berichten"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Accountbeheer"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Script _toevoegen"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Nieuwe handtekening toevoegen..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Berichten naar _mijzelf versleutelen bij het versturen van versleutelde "
 "berichten"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Altijd een geheime kopie (Bcc) naar:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Altijd een kopie (Cc) naar:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sleutels in mijn sleutelbos altijd _vertrouwen bij versleutelen"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Originele bericht bijvoegen"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_tekencodering:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Kleuren"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Controleren voor N_ieuwe Berichten"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Spelling controleren terwijl ik _tik"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Controleren voor Nieuwe Berichten"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Controleer binnenkomende mail berichten op troep"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Kleur voor _spelfouten:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Berichten Opstellen"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14385,143 +14379,139 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Standaardgedrag"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Standaard teken_codering:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Verwijderen van e-mail"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "Uitgaande berichten _altijd ondertekenen bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Originele bericht niet citeren"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Aanvragen voor bijeenkomsten _niet ondertekenen (voor Outlook "
 "compatibiliteit)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Klad-map:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-mail accounts"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-mail_adres:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Prullenbakken legen bij afsluiten"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Encry_ptie certificaat:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Vaste breedte:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Filter opties"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Lettertype-eigenschappen"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Berichten opmaken met _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Kopp_en"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Citaten _accentueren met"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Labels en kleuren"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Afbeeldingen laden"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Mailbox locatie"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Berichten opstellen"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Berichtweergave"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Berichtlettertype"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14529,141 +14519,141 @@ msgstr ""
 "Opmerking: U wordt pas om uw wachtwoord gevraagd wanneer uw voor het eerst "
 "contact maakt"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisatie:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG sleutel ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Afgedrukte lettertypes"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Originele bericht citeren"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Ant_woordadres:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "E-mail ontvangen"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Ontvangst-instellingen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Wachtwoord onthouden"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Vereiste informatie"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Standaardinstellingen herstellen"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "B_eveiliging"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Beveiligde MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Kies HTML lettertype met gelijke breedte"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Kies HTML lettertype met gelijke breedte voor afdrukken"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Kies HTML lettertype met variabele breedte"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Kies HTML lettertype met variabele breedte voor afdrukken"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "E-mail versturen"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en Klad Berichten"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Zelf-ondertekend certificaat in sleutelbos"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Geef _bestandsnaam:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Spellings_controle"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14673,7 +14663,7 @@ msgstr ""
 "uw ondertekening. De naam die u hier geeft zal\n"
 "uitsluitend voor weergavedoeleinden gebruikt worden."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14683,7 +14673,7 @@ msgstr ""
 "lijst van beschikbare talen komt overeen met de waarvoor een woordenboek "
 "geïnstalleerd is."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14691,15 +14681,15 @@ msgstr ""
 "Geef de naam die u aan dit account wilt geven.\n"
 "Bijvoorbeeld: \"zakelijk\" of \"persoonlijk\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Gebruik _Daemon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariabele breedte:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14709,175 +14699,175 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Handtekening _toevoegen"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Uitgaande berichten _altijd ondertekenen bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Aanmeldingstype:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Aanmeldingstype:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automatisch controleren op nieuwe post, iedere"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch smileys invoegen"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Piepen bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Bevestigen bij het legen van een map"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Standaardhandtekening:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Standaardinstellingen"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Geen melding bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Gebruiken"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "V_ersleutel uitgaande berichten (standaard)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Doorstuurstijl:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML e-mail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identiteit"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Troep"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Afbeeldingen tonen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Enkel _locale testen"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Dit instellen als standaardaccount"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Berichten als gelezen markeren na "
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Geluid afspelen bij binnenkomst van nieuwe e-mail"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Waarschuwen wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Berichten ontvangen"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Antwoordstijl:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Standaardinstellingen herstellen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Selecteer..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "E-mail ver_sturen"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Bewegende afbeeldingen _weergeven"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Handtekeningen"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Standaardlettertype"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminal-lettertype:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Beveiligde verbinding (SSL) gebruiken:"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als de andere programma's"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s wordt opgezocht"
@@ -14912,128 +14902,128 @@ msgstr "Map wordt gefilterd"
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" wordt verzonden"
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bericht %d van %d wordt verzonden"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Bezig met opslaan account '%s'"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Map wordt ververst"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van '%s' wordt geleegd"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15042,7 +15032,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15051,11 +15041,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15064,22 +15054,22 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Veranderen troep status"
 
@@ -15111,38 +15101,38 @@ msgstr "Versleuteling"
 msgid "Security Information"
 msgstr "Beveiligingsinformatie"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Annuleren..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pas: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "E-mail versturen & ontvangen"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "_Alles annuleren"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
@@ -18394,6 +18384,20 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Controleer binnenkomende mail in IMAP accounts op troep"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Doe troep-test op binnenkomende mail voor IMAP accounts (enkel geldigals "
+#~ "check_incoming is ingesteld op true)"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
 #~ msgid "No data provided"
 #~ msgstr "Geen data gegeven"
 
@@ -27704,9 +27708,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Moderate mist"
 #~ msgstr "Middelmatige mist"
 
-#~ msgid "Thick mist"
-#~ msgstr "Dikke mist"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Matige mist"
 
diff --git a/po/nn.po b/po/nn.po
index 2a181c3e84..1e3c34b6a6 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -49,8 +49,7 @@ msgstr "Set opp autofullføring her"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -91,20 +90,21 @@ msgstr "Evolution oppsettkontroll for mappeinnstillingar"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, 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-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -112,65 +112,65 @@ msgstr "Ny adressebok"
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Opprett ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Lag ei ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Klarte ikkje å kopla til LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføra spørjing på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Feil ved henting av skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Overfører ..."
 
@@ -187,39 +187,41 @@ msgstr ""
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Overfører «%s»:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "På denne datamaskina"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personleg"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "På LDAP-tenarar"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP-tenarar"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Autofullføringsinnstillingar"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -231,7 +233,7 @@ msgstr ""
 "til å visa. Gjer søket ditt meir spesifikt eller hev\n"
 "resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -243,20 +245,20 @@ msgstr ""
 "auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
 "for denne adresseboka."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
 # TRN. «Aksessera». Blæ.
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -264,7 +266,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Sjå etter at stien finst og at du har "
 "løyve til å aksessera han."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -272,7 +274,7 @@ 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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -282,7 +284,7 @@ msgstr ""
 "ynsjer å bruka LDAP i Evolution, må du kompilera programmet frå kjeldekoden "
 "i CVS etter at du har henta OpenLDAP frå lenkja under."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -290,28 +292,33 @@ 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Ikkje i stand å opna adresseboka"
 
 # TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID til kontaktkjelda som framvisinga vil visa"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI-en som kalenderen skal visa"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -356,7 +363,7 @@ msgstr "  V_is støtta basar "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -388,19 +395,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Vegvisar for oppretting av adressebok"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Addressebokeigenskapar"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Addressebokkjelder"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adressebokkjelder ..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alltid"
 
@@ -411,7 +421,8 @@ msgstr "Anonymt"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -420,53 +431,53 @@ msgstr ""
 "Trykk på «Fullfør»-knappen for å lagra innstillingane du har\n"
 "skrive inn her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Ferdig"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmennt"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Aldri"
 
 # TRN: «Kryptografisk». For eit vakkert ord.
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -480,23 +491,23 @@ msgstr ""
 "av nokre tenarar for å verna tilkoplinga di kryptografisk. Spør "
 "systemadministratoren din om LDAP-tenaren din bruker desse protokollane.Å"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Ein"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Valde:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -505,7 +516,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -520,7 +531,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:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -532,7 +543,7 @@ 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:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -542,39 +553,41 @@ msgstr ""
 "Dette valet let deg endra Evolution sine standardinnstillingar \n"
 "for LDAP-søk, og for å oppretta og redigera kontaktar."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Det fyrste steget i å laga ei adressebok er å velja eit skjermnamn og gruppe."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Steg 1: Mappekarakteristikk"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Steg 2: Tenarinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Steg 3: Koplar til tenar"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Steg 4: Søker gjennom katalogen"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Støtta søkebasar"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -586,7 +599,7 @@ msgstr ""
 "søka dine, og kor lang tid eit søk skal ta. Spør systemadministratoren din "
 "dersom du treng å endra desse vala."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -597,7 +610,7 @@ msgstr ""
 "starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
 "katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -611,11 +624,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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -625,23 +640,24 @@ msgstr ""
 "informasjon. Ta kontakt med din systemansvarlege dersom du treng \n"
 "hjelp til å finna denne informasjonen."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Dette er øvre grense for kor mange oppføringar som skal lastast ned. Å setja "
 "dette talet\n"
 "for høgt vil få adresseboka di til å gå sakte."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -651,7 +667,7 @@ msgstr ""
 "at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
 "tenaren."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -660,7 +676,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -669,7 +685,7 @@ msgstr ""
 "Dette er det namnet på tenaren som vert vist i Evolution si mappeliste. Det "
 "vert berre brukt til å visast på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -680,28 +696,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "B_ruk SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Brukar e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -713,19 +729,19 @@ msgstr ""
 "som trengst for å logga inn. Spør systemadministratoren din dersom du er "
 "usikker på kva denne informasjonen er."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Vist namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -734,39 +750,39 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Metode for å logga inn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Tid før avbrot (minutt):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "tilkopling-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "almennt-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "søke-fane"
 
@@ -881,7 +897,7 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -976,10 +992,10 @@ msgstr "_Kategoriar ..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1027,15 +1043,15 @@ msgid "_Web page address:"
 msgstr "Ne_ttsideadresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2029,103 +2045,111 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Teneste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Plassering"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Heim"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Kjeldebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Endra"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Kontonamn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten høyrer til desse kategoriane:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Lagra kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2133,7 +2157,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "sletta desse kontaktane?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2141,46 +2165,51 @@ msgstr ""
 "Er du sikker på at du vil\n"
 " slette denne kontakta?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Gruppe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kan ikkje finna skjermelement for felt: «%s»"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Ny kontakt - raskt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Fullt namn:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_post:"
 
@@ -2337,11 +2366,11 @@ msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Redigering av kontakter"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Lagra liste som VCard"
 
@@ -2430,13 +2459,13 @@ msgid "Email begins with"
 msgstr "E-post byrjar med"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
@@ -2453,101 +2482,101 @@ msgid "Type"
 msgstr "Type"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagra som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Gå til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importér ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressebokkjelder ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot-innstillingar ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressebok ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressebok ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktiv vising"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2559,8 +2588,8 @@ msgstr ""
 "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Einkvar kategori"
 
@@ -2603,7 +2632,7 @@ msgid "Company Phone"
 msgstr "Firmatelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2662,7 +2691,7 @@ msgid "Nickname"
 msgstr "Kallenamn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Merknad"
 
@@ -2671,7 +2700,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -2798,66 +2827,72 @@ msgstr "Vald"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Listemedlemmar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Skildring"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personleg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Vevlogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Jobbtittel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Heimeside"
 
@@ -2866,8 +2901,8 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2897,7 +2932,7 @@ msgstr "Protokollen er ikkje støtta"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2917,7 +2952,8 @@ msgid "TLS not Available"
 msgstr "TLS er ikkje tilgjengeleg"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adresseboka finst ikkje"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3052,7 +3088,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Legg til addresser for eksisterande kontakt «%s»"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Spør adresseboka ..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3107,17 +3144,40 @@ msgstr "Opphavsrett © 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm-importerar"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar-import"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar-import"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Skriv ut kontaktar"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
@@ -3209,7 +3269,7 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal på kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Val"
 
@@ -3387,8 +3447,8 @@ msgstr "Filnamn ikkje oppgjeve."
 msgid "Unnamed List"
 msgstr "Liste utan namn"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Skriv inn passord"
 
@@ -3465,10 +3525,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution oppgåvekomponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Oppgåver"
 
@@ -3513,26 +3572,24 @@ msgstr "Tid alarmen skal utsetjast (minutt):"
 msgid "_Edit appointment"
 msgstr "R_edigér avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Opna"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Opna"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3545,12 +3602,12 @@ msgstr ""
 "Startar %s\n"
 "Sluttar %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3562,7 +3619,7 @@ msgstr ""
 "senda ein e-post. Evolution vil visa ein normal\n"
 "påminnar-dialogboks i staden."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3579,19 +3636,19 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køyra dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Kan ikkje initialisera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Klarte ikkje å initialisere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Kan ikkje laga factory for alarmtenesta"
 
@@ -3727,24 +3784,30 @@ msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timars"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om vekenummer skal visast i minikalenderen"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Skildring inneheld"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3774,7 +3837,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
@@ -3796,71 +3859,71 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Lag ein ny møteførespurnad"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Avtale for heile _dagen"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Lag ein ny kalender"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3993,7 +4056,7 @@ msgstr "timar"
 msgid "minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4065,7 +4128,7 @@ msgid "hour(s)"
 msgstr "time/timar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -4076,7 +4139,7 @@ msgstr "byrjing på avtale"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "På"
 
@@ -4126,7 +4189,7 @@ msgstr "30 minutt"
 msgid "60 minutes"
 msgstr "60 minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Åtvaringar"
 
@@ -4151,7 +4214,7 @@ msgid "Days"
 msgstr "Dagar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "S_lå på"
 
@@ -4291,7 +4354,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4387,7 +4450,7 @@ msgstr ""
 "skrive inn her."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Ny oppgåveliste"
 
@@ -4557,23 +4620,23 @@ msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Ferdig"
 
@@ -4609,8 +4672,8 @@ msgstr "Journaloppføring - %s"
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Lagra som ..."
 
@@ -4638,10 +4701,21 @@ msgstr "Klarte ikkje opna mål"
 msgid "Destination is read only"
 msgstr "Målet er skrivebeskytta"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Vel målkjelde"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Ny oppgåveliste"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4744,7 +4818,7 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -4768,23 +4842,32 @@ msgstr ""
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Forfallsdato er før startdato"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan ikkje opna kalenderen «%s»."
@@ -4860,29 +4943,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegér til ..."
 
@@ -5070,7 +5153,7 @@ msgstr "den"
 msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -5103,7 +5186,7 @@ msgid "_No recurrence"
 msgstr "_Inga repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -5145,7 +5228,7 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Forkast endringar"
 
@@ -5169,7 +5252,7 @@ msgstr "Informasjonen om tildelinga av oppgåva er endra. Send ut?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgåveinformasjonen er endra. Send ein oppdatert versjon?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
 
@@ -5183,7 +5266,7 @@ msgstr "% _ferdig"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Ferdig"
 
@@ -5196,7 +5279,7 @@ msgstr "Høg"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Under arbeid"
 
@@ -5215,7 +5298,7 @@ msgstr "Vanleg"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Ikkje starta"
 
@@ -5254,16 +5337,16 @@ msgstr "Enkel"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Forfallsdato er før startdato"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ikkje i stand å opna oppgåver i «%s»."
@@ -5274,7 +5357,7 @@ msgstr "Kon_fidensielt"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -5458,11 +5541,10 @@ msgstr "Start-dato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "farge"
 
@@ -5488,7 +5570,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5523,10 +5605,10 @@ msgstr "Nei"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjend"
@@ -5539,99 +5621,105 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Opna"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Lagra som ..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Innstillingar ..."
 
@@ -5718,7 +5806,7 @@ msgid "Alarms"
 msgstr "Alarmar"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5777,26 +5865,26 @@ msgstr "%02i minutt oppdeling"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5979,7 +6067,7 @@ msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -6437,12 +6525,12 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å opna %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6452,7 +6540,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6460,12 +6548,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opnar oppgåver på %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6474,28 +6562,38 @@ msgstr ""
 "Feil under opning av %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Lastar oppgåver"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Avtale - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6614,16 +6712,16 @@ msgstr "Ledig/oppteken-informasjon (%s til %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Du må delta på denne hendinga."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Skriv inn passordet for %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6631,7 +6729,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6639,12 +6737,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6833,49 +6931,49 @@ msgstr "Vald månad (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Oppgåve"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
@@ -6884,36 +6982,36 @@ msgstr "Utskriftoppsett"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Opprett ei ny oppgåve"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Ny oppgåveliste"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Oppgåveliste"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Lag ei ny oppgåveliste"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6970,20 +7068,20 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Fjern gamle avtalar og møter"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Påminning!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalenderhending"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6991,7 +7089,7 @@ msgstr ""
 "Evolution har funne Gnome Calendar-filer.\n"
 "Vil du importera desse inn i Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -8650,7 +8748,7 @@ msgstr "Kan ikkje opna melding"
 msgid "Failed on message %d"
 msgstr "Feila på melding %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
@@ -8736,7 +8834,7 @@ msgstr "Kopierer meldingar"
 msgid "Filtering new message(s)"
 msgstr "Filtrerer nye meldingar"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8747,46 +8845,42 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar frå GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Ingen data gjevne"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
 # TRN: Denne bør skrivast om.
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8798,59 +8892,59 @@ msgstr ""
 "%s"
 
 # TRN: Sjå førre.
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kan ikkje køyra gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Feil under køyring av gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kan ikkje stadfesta signaturen på meldinga: Feil format på meldinga"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Klarte ikkje å laga krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Kryptert innhald"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikkje motta fil"
@@ -8963,21 +9057,34 @@ msgstr ""
 msgid "parse error"
 msgstr "Anna feil"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Klarte ikkje å laste %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonym"
@@ -9120,7 +9227,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9255,20 +9362,7 @@ msgstr "Namneoppslag feila: vert ikkje funnen"
 msgid "Host lookup failed: unknown reason"
 msgstr "Namneoppslag feila: ukjend grunn"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9338,21 +9432,25 @@ msgstr "Tenar: %s, Type: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Papirkorg"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9577,21 +9675,31 @@ msgstr "Inga slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Kan ikkje lukka mellombels mappe: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9609,16 +9717,11 @@ msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
 
 # TRN: Kva betyr dette?
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatisk synkroniser ekstern e-post med lokal"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adressebok"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9638,43 +9741,41 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Passord"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Forvald"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "liste"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9683,26 +9784,26 @@ msgstr ""
 "Åtvaring frå IMAP-tenaren %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventa svar frå IMAP-tenaren: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventa svar «OK» frå IMAP-tenar: %s"
@@ -9717,7 +9818,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappa vart øydelagt og laga på nytt på tenaren."
 
@@ -9726,12 +9827,12 @@ msgstr "Mappa vart øydelagt og laga på nytt på tenaren."
 msgid "Scanning for changed messages"
 msgstr "Leitar etter endra meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikkje henta melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9747,25 +9848,25 @@ msgstr ""
 "Klarar ikkje å hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Hentar samandrag om nye meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Fann ikkje meldingskropp i svar på FETCH."
 
@@ -9823,27 +9924,37 @@ msgstr "Namnerom"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Sjå etter ny e-post i alle mappene"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Sjå etter ny e-post i alle mappene"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tenar %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-teneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9852,65 +9963,65 @@ msgstr "IMAP-teneste for %s på %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9920,24 +10031,32 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappa «%s» finst ikkje"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappenamnet «%s» er ugyldig, avdi det inneheld teiknet «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjend opphavsmappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Foreldermappa kan ikkje ha undermapper"
 
@@ -9962,7 +10081,7 @@ msgstr ""
 "\n"
 "IKKJE BRUK DETTE TIL VANLEG E-POST!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kan ikkje kopla til POP-tenaren på %s"
@@ -10046,8 +10165,8 @@ msgstr ""
 "og Mutt-type."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10059,55 +10178,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan ikkje henta mappa: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Lokale lager har ikkje innboks."
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal maldingsfil %s "
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Kan ikkje sletta samandragsfila for mappa «%s»: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kan ikkje lagra samandrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan ikkje leggja til melding i samandraget. Årsaken er ukjend."
 
@@ -10125,53 +10244,44 @@ msgstr "Kan ikkje leggja til melding i maildir-mappe: %s: %s"
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhald"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje opna mappa «%s»: \n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Kan ikkje henta mappa: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappa «%s» eksisterar ikkje."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje laga mappa «%s»:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "«%s» er ikkje ein maildir-katalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kan ikkje sletta mappa «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ikkje ein maildir-katalog"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10193,9 +10303,9 @@ msgid "Checking for new messages"
 msgstr "Ser etter nye meldingar"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Lagrar mappe"
@@ -10239,157 +10349,135 @@ msgstr "Mappa ser ut til å vera øydelagt og kan ikkje reparerast."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Bygginga av meldinga feila. Øydelagt mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje opna fila «%s»:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Kan ikkje laga ei mappe med dette namnet."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Klarte ikkje å laga katalogen «%s»:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Kan ikkje leggja ved fila «%s»: Ikkje ei vanleg fil"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Kan ikkje laga fila «%s»:\n"
+"Kan ikkje sletta mappa «%s»:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "«%s» er ikkje ei vanleg fil."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikkje sletta mappa «%s»:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappa «%s» er ikkje tom. Ikkje sletta."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Kan ikkje laga ei mappe med dette namnet."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikkje laga katalogen «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenamnet er ikkje gyldig."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kan ikkje endra namnet på «%s» til «%s»: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kan ikkje opna mappa: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikkje sjekka mappa: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kan ikkje opna fila: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikkje opna mellombels postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kan ikkje lukka kjeldamappa %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kan ikkje endra namnet på mappa: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kan ikkje lagra mappa: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10404,10 +10492,17 @@ msgstr "Sender ei melding til ein nettverksspelar"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikkje leggja til melding i mh-mappe: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Kan ikkje laga mappa «%s»:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "«%s» er ikkje ein katalog"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Kan ikkje henta mappa: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10429,6 +10524,29 @@ msgstr "Spool «%s» er ikkje ei vanleg fil eller katalog"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappa «%s/%s» finst ikkje."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Kan ikkje opna mappa «%s»: \n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mappa «%s» eksisterar ikkje."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kan ikkje laga mappa «%s»:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
@@ -10663,48 +10781,48 @@ msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan ikkje flytta ei mappe inn i ei av undermappene sine."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Ukjend feil: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Mappa finst ikkje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kan ikkje henta gruppa: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Kunne ikkje senda meldinga: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s Ser gjennom nye meldingar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukjent svar frå tenaren: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 #, fuzzy
 msgid "Use cancel"
 msgstr "Avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlinga feila: %s"
@@ -10754,7 +10872,7 @@ msgstr "Slett etter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10838,7 +10956,7 @@ msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10890,7 +11008,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11062,7 +11180,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
@@ -11172,36 +11290,36 @@ msgstr "Tidsavbrot for QUIT-føespusnad: %s"
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frå lista"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
@@ -11327,18 +11445,18 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Attach file(s)"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11347,31 +11465,31 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11380,7 +11498,7 @@ msgstr ""
 "Kan ikkje søka i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11389,7 +11507,7 @@ msgstr ""
 "Kan ikkje kutta av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11398,7 +11516,7 @@ msgstr ""
 "Kan ikkje kopiera fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11407,7 +11525,7 @@ msgstr ""
 "Feil under automatisk lagring av meldinga: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11416,7 +11534,7 @@ msgstr ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i Evolution?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11427,50 +11545,50 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11479,14 +11597,14 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 #, 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:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11847,7 +11965,7 @@ msgstr "Tiaren"
 msgid "You must specify a folder."
 msgstr "Stilnamn:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -11862,19 +11980,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Hugseliste"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Seinare"
 
@@ -11957,7 +12075,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -11974,7 +12092,7 @@ msgstr "sidan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekund"
 
@@ -12152,7 +12270,7 @@ msgstr "er ikkje flagga"
 msgid "Junk Test"
 msgstr "Juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12263,9 +12381,10 @@ msgstr "byrjar med"
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Emne"
 
@@ -12273,25 +12392,25 @@ msgstr "Emne"
 msgid "Unset Status"
 msgstr "Nullstill status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnamnet «%s» er ikkje unikt. Vel eit anna namn"
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Reglar"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -12331,15 +12450,15 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Du må gje denne mappa eit namn."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må ha minst ei mappe som kjelde."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "vMappe-kjelde"
 
@@ -12388,9 +12507,9 @@ msgstr "Evolution e-post-mappevisar"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-postinnstillingskontroll"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "E-post"
 
@@ -12398,7 +12517,7 @@ msgstr "E-post"
 msgid "Mail Accounts"
 msgstr "E-postkontoar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "E-postinnstillingar"
 
@@ -12439,15 +12558,15 @@ msgstr "Du må oppgje eit gylig skriptnamn."
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Legg till skriptsignatur"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
@@ -12534,7 +12653,6 @@ msgid "Unread messages"
 msgstr "Neste _ulesne melding"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velje mappe>"
 
@@ -12542,396 +12660,412 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Create New Folder"
 msgstr "Lag ny mappe"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Lastar ..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Berre sjekk for ny e-post."
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kan ikkje sletta mappa «%s»: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Verkeleg sletta mappa «%s»?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett «%s»"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på mappa «%s» til:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Endra namn på mappa"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "_Flytt"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Ny mappe"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genskapar ..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "_Følg opp ..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 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:788
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Bruk filter"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Forvald"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Trykk her for å leggje til ei oppgåve"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Treff:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Tildelt"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Legg til kriterium"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Legg til kriterium"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Avbroten"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat-ID:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%d. %b %k:%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%d. %b %k:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis innvevd"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "_Gøym"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
@@ -12975,29 +13109,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Flyttar melding"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Frå"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -13011,8 +13150,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13030,21 +13169,26 @@ msgstr "Kunne ikkje senda meldinga: %s"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Ustøtta skjema"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Kan ikkje dekryptera sertifikatsignaturen."
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13056,61 +13200,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Kan ikkje leggja %s i mellomlageret: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Kan ikkje leggja %s i mellomlageret: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Kan ikkje oppretta røyr til «%s»: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Klarte ikkje å slå opp verten «%s»: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bruk til _bakgrunn"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Opna i %s ..."
@@ -13161,18 +13305,18 @@ msgstr "Filter"
 msgid "-------- Forwarded Message --------"
 msgstr "Vidaresendt melding"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13181,7 +13325,7 @@ msgstr ""
 "Klarte ikkje å lagra til «%s»\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13190,31 +13334,37 @@ msgstr ""
 "%s eksisterer allereide\n"
 "Vil du skriva over?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Melding"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fila «%s» finst ikkje, eller er ikkje ei vanleg fil."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Lagra melding ..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Adresse"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Melding frå %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13227,7 +13377,7 @@ msgstr ""
 "\n"
 "Vil du fjerna desse meldingane?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13255,215 +13405,229 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Standardemne for meldinga"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Standardemne for meldinga"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Skriv tittelen på ruta her."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Skriv tittelen på ruta her."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Standard vidaresendingsstil er: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Standardemne for meldinga"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Standardemne for meldinga"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Standard vidaresendingsstil er: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Gøym snarveglinja"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Gøym snarveglinja"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Send meldinga seinare"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "E-postkontoar"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Påminning ved ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Påminning ved ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13471,105 +13635,99 @@ msgid ""
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Send e-post i HTML-format?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Send e-post i HTML-format?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Vi_s animerte bilete"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Vi_s animerte bilete"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Vis melding på normal måte"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Førehandsvis i"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminalskrifttype:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13577,172 +13735,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Tråda meldingsliste"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Tråda meldingsliste"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "V_ariabel breidde:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importér"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-importerar"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine-importerar"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gamal e-post frå Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer ..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vent litt"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importerar %s som %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Søker gjennom %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importerer filer"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13750,16 +13905,44 @@ msgstr ""
 "Evolution har funne e-post-filer frå Elm.\n"
 "Vil du importera desse filene til Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Målet er skrivebeskytta"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importerar"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importerer filer"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Søker gjennom %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13785,7 +13968,7 @@ msgstr ""
 "prioritetar. Kontroller dei importerte filtera for å vera\n"
 "sikker på at alt virkar som før."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13797,7 +13980,7 @@ msgstr ""
 "som ikkje er støtta i Evolution. Desse filtera\n"
 "vil bli forkasta."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13812,31 +13995,24 @@ msgstr ""
 "å testa om den gjevne strengen er ein del av\n"
 "meldingskroppen eller ikkje."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer gamle Netscape-data"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Søker gjennom e-postfilter"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Søker gjennom katalog"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Startar importering"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importerer gamle Netscape-data"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "E-postfilter"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13844,11 +14020,20 @@ msgstr ""
 "Evolution har funne Netscape-e-postfilter.\n"
 "Vil du importera dei til Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerar dine galme Pine-data"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importerer filer"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adressebok"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13856,7 +14041,7 @@ msgstr ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13899,19 +14084,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Sti:"
 
@@ -13963,28 +14148,43 @@ msgstr ""
 "    «%s»\n"
 "og har blitt oppdaterte."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_E-post"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Ny vMappe"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-postfilter"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Lag ein ny kalender"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI-en som kalenderen skal visa"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14021,7 +14221,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -14044,126 +14244,121 @@ msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Søk etter støtta typar "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Kontoredigerar"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Legg til skript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Legg til ny signatur ..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "T_eiknsett:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "F_argar"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstava ord:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14173,507 +14368,503 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Standardåtferd"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardt_eiknsett:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Ikkje siter opprinneleg melding"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Mappe for _utkast:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fast _breidd:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "&lt;&lt; Ferre val"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formater meldingar med _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Topptekst"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Merkelappar og fargar"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Lastar bilete"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Meldingsvising"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Meldinga inneheld"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Påminning ved ny e-post"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Skrifttypar til utskrift"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Siter opprinneleg melding"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Val for m_ottak"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Hugs dette _passordet"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Tryggl_eik"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldingar:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Oppgje _filnamn:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Sjå etter nye meldingar kvart"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Legg til smilefjes _automatisk"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Stadfest ved tøming av mappe"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Skru på"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML-e-post"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Juni"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Last bileta dersom sendaren står i adresseboka"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Last aldri bilete frå _nettet"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "_Vel ..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Sender e-post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilete"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standard skrifttype:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14696,7 +14887,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Arbeidar"
 
@@ -14709,128 +14900,128 @@ msgstr "Les mapper"
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feila på melding %d av %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14839,7 +15030,7 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14848,11 +15039,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14861,22 +15052,22 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14911,39 +15102,39 @@ msgstr "Kryptering"
 msgid "Security Information"
 msgstr "Tryggleiksinformasjon"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Ventar ..."
 
@@ -15050,20 +15241,20 @@ msgid ""
 "And have been updated."
 msgstr " s."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøvar å redigere ei vmappe «%s» som ikkje finnest."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
@@ -15403,97 +15594,20 @@ msgstr "Mapper som er tilgjengelege fråkopla"
 msgid "Autocompletion Folders"
 msgstr "Autofullføringsmapper"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Kan ikkje kopiera mappe: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Kan ikkje flytta mappe: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Kan ikkje flytta ei mappe over seg sjølv."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Kan ikkje kopiera ei mappe oppå seg sjølv."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Kan ikkje flytta ei mappe inn i ei av undermappene sine."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Vel ei mappe som mappa «%s» skal kopierast inn i:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopier mappe"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Vel ei mappe som mappa «%s» skal flyttast inn i:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Flytt mappe"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Kan ikkje sletta mappa:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Verkeleg sletta mappa «%s»?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Kan ikkje endra namn på mappa:\n"
+"Kan ikkje laga den oppgjevne mappa:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Det oppgjevne mappenamnet er ikkje gyldig: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Den valde mappa høyrer ikkje til ein anna brukar"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Kan ikkje fjerna mappa:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan ikkje laga den oppgjevne mappa:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Utan tittel)"
@@ -15635,7 +15749,7 @@ msgstr "Feil under køyring av gpg."
 msgid "_Import"
 msgstr "_Importér"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Lukkar tilkoplingar ..."
 
@@ -15673,6 +15787,10 @@ msgstr "Kan ikkje opna delt mappe: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikkje finna den spesifiserte delte mappa."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Startar importering"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15785,123 +15903,6 @@ msgstr "Oppsettsdatabasen ikkje funnen"
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Lag ny snarveggruppe"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Gruppenamn:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Vil du verkeleg fjerna gruppa «%s» frå snarveglinja?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Byt namn på snarveggruppe"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Byt namnet på snarveggruppa til:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Små ikon"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Vis snarvegane som små ikon"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "S_tore ikon"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Vis snarvegane som store ikon"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Ny gruppe ..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Lagar ei ny snarveggruppe"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Fje_rn denne gruppa ..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Fjern denne snarveggruppa"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Byt _namn på denne gruppa ..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Byt namn på denne snarveggruppa"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Gøym snarvegstolpen"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Gøym snarveglinja"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Lag st_andardsnarvegar"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Lag standardsnarvegar"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Gje snarveg nytt namn"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Endra namn på valde snarvegar til:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Opna mappa som denne snarvegen peikar på"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Opna i nytt _vindauge"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Opna mappa som denne snarvegen peikar på i eit nytt vindauge"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Gi denne snarvegen nytt namn"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Fj_ern"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Fjern denne snarvegen frå snarvegstolpen"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Feil ved lagring av snavegar."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Snarvegar"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -15913,11 +15914,6 @@ msgstr "Avkryssingsboks"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» i «%s»"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16219,58 +16215,58 @@ msgstr ""
 "%s: «--online» og «--offline» kan ikkje brukast samstundes.\n"
 "  Bruk «%s --help» for å få meir informasjon.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vel importerar"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Framgang"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 #, fuzzy
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Uttrykk"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadresse:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Tast inn passord for %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16339,7 +16335,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "Sertifikat"
@@ -16414,11 +16410,11 @@ msgstr "Organisasjonseining"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16466,244 +16462,244 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Dine sertifikat"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Versjon"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 #, fuzzy
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Sertifikat-ID:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Sertifikat-ID:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Offentleg nøkkel: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Kan ikkje verifisera sertifikat."
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen informasjon"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "vedlegg"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Sertifikat-ID:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Kritisk"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Utvidingar"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Signaturfil:"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "Utferdar"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Signaturfil:"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Tast inn passord for %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Sertifikat-ID:"
@@ -17300,7 +17296,8 @@ msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "_Legg til avsendar i adresseboka"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17309,7 +17306,7 @@ msgstr "_Bruk filter"
 
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
-msgid "Add Sender to Addressbook"
+msgid "Add Sender to Address Book"
 msgstr "Legg til avsendar i adresseboka"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17799,10 +17796,6 @@ msgstr "Form_at"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Opna"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Opna ei fil"
@@ -18174,22 +18167,6 @@ msgstr "_Sende / Motta"
 msgid "_Window"
 msgstr "_Finn no"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Skriv ut samandrag"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Skriv ut samandrag"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Last om att"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Last om att vising"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
@@ -18256,8 +18233,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr "_Oppgåver"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18510,23 +18487,23 @@ msgstr "_Søk"
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Element-ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Underelement-ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Finn _no"
 
@@ -18540,6 +18517,205 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 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"
+#~ msgstr ""
+#~ "Kan ikkje opna fila «%s»:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikkje å laga katalogen «%s»:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje laga fila «%s»:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "«%s» er ikkje ein katalog"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importerar %s som %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Søker gjennom e-postfilter"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Søker gjennom katalog"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Kan ikkje kopiera mappe: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Kan ikkje flytta mappe: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Kan ikkje flytta ei mappe over seg sjølv."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Kan ikkje kopiera ei mappe oppå seg sjølv."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Kan ikkje flytta ei mappe inn i ei av undermappene sine."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Vel ei mappe som mappa «%s» skal kopierast inn i:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopier mappe"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Vel ei mappe som mappa «%s» skal flyttast inn i:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Flytt mappe"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje sletta mappa:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Verkeleg sletta mappa «%s»?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje endra namn på mappa:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Den valde mappa høyrer ikkje til ein anna brukar"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje fjerna mappa:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Lag ny snarveggruppe"
+
+#~ msgid "Group name:"
+#~ msgstr "Gruppenamn:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Vil du verkeleg fjerna gruppa «%s» frå snarveglinja?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Byt namn på snarveggruppe"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Byt namnet på snarveggruppa til:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Små ikon"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Vis snarvegane som små ikon"
+
+#~ msgid "_Large Icons"
+#~ msgstr "S_tore ikon"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Vis snarvegane som store ikon"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Ny gruppe ..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Lagar ei ny snarveggruppe"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Fje_rn denne gruppa ..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Fjern denne snarveggruppa"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Byt _namn på denne gruppa ..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Byt namn på denne snarveggruppa"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Gøym snarvegstolpen"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Gøym snarveglinja"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Lag st_andardsnarvegar"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Lag standardsnarvegar"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Gje snarveg nytt namn"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Endra namn på valde snarvegar til:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Opna mappa som denne snarvegen peikar på"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Opna i nytt _vindauge"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Opna mappa som denne snarvegen peikar på i eit nytt vindauge"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Gi denne snarvegen nytt namn"
+
+#~ msgid "Re_move"
+#~ msgstr "Fj_ern"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Fjern denne snarvegen frå snarvegstolpen"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Feil ved lagring av snavegar."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Snarvegar"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "«%s» i «%s»"
+
+#~ msgid "Print Summary"
+#~ msgstr "Skriv ut samandrag"
+
+#~ msgid "Print summary"
+#~ msgstr "Skriv ut samandrag"
+
+#~ msgid "Reload"
+#~ msgstr "Last om att"
+
+#~ msgid "Reload the view"
+#~ msgstr "Last om att vising"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopier til mappe ..."
 
diff --git a/po/no.po b/po/no.po
index a267c4b803..1cdcebb932 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-02-10 21:44+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-02-10 21:49+0100\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"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -46,8 +46,7 @@ msgstr "Konfigurer automatisk fullføring her"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -87,19 +86,20 @@ msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adressebok «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -107,65 +107,65 @@ msgstr "Ny adressebok"
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Kunne ikke koble til LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kunne ikke autentisere mot LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføre spørring på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Feil under henting av schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migrerer..."
 
@@ -182,39 +182,41 @@ msgstr ""
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personlig"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Innstillinger for autofullføring"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -222,7 +224,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -230,19 +232,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -250,7 +252,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien eksisterer og "
 "at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -258,7 +260,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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -268,7 +270,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du kompilere programmet fra kildekoden i "
 "CVS etter å ha hentet OpenLDAP fra lenken under."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -276,27 +278,32 @@ 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID for kontaktkilden som visningen skal vise"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URIen som kalenderen skal vise"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList xml for listen med fullføringsURIer"
@@ -340,7 +347,7 @@ msgstr " V_is støttede baser "
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -372,19 +379,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Assistent for oppretting av adressebok"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adressebok-kilder"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adressebok-kilder..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alltid"
 
@@ -393,8 +403,10 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -403,51 +415,51 @@ msgstr ""
 "Vennligst klikk på «Bruk»-knappen for å lagre innstillingenene du har "
 "oppgitt her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Tilkobling"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruke DN til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Fullført"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -457,23 +469,23 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Valgt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -483,7 +495,7 @@ msgstr ""
 "tjener hvis\n"
 "denne støtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -500,7 +512,7 @@ msgstr ""
 "vil ikke Evolution behøve å bruke SSL/TLS fordi tilkoblingen allerede er "
 "sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -513,7 +525,7 @@ msgstr ""
 "betyr at din tilkobling vil være usikker, og at du vil være sårbar for "
 "sikkerhetshull. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -524,40 +536,42 @@ msgstr ""
 "innstillinger\n"
 "for LDAP-søk, og for oppretting og redigering av kontakter. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Spesifisering av visningsnavn og gruppe er det siste steget i konfigurasjon "
 "av en adressebok."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Steg 1: Karakteristikk for mappe"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Steg 2: Tjenerinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Steg 3: Kobler til tjener"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Steg 4: Søker i katalogen"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -571,7 +585,7 @@ msgstr ""
 "trenger\n"
 "å endre disse alternativene."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -582,7 +596,7 @@ msgstr ""
 "starte.\n"
 "Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -596,11 +610,13 @@ msgstr ""
 "Et søkeområde som «sub» vil ta med alle oppføringer under din søkebase.\n"
 "Et søkeområde som «one» vil kun ta med oppføringer ett nivå under basen.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -610,24 +626,25 @@ msgstr ""
 "oppretter. Vennligst kontakt din systemadministrator hvis du trenger\n"
 "hjelp til å finne denne informasjonen."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter "
 "dette tallet \n"
 "for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -636,7 +653,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «e-post-adresse» krever anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -645,7 +662,7 @@ msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
 "Det brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -654,7 +671,7 @@ msgstr ""
 "Dette er navnet som vises i mappelisten i Evolution og brukes kun for "
 "visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -665,28 +682,28 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken\n"
 "port du skal bruke."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Dette alternativet kontrollerer hvor lenge et søk vil kjøre."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "B_ruk SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -698,19 +715,19 @@ msgstr ""
 "Vennligst spør din systemadministrator hvis du ikke er sikker på hva dette "
 "er."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -719,39 +736,39 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Tidsavbrudd (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -866,7 +883,7 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -960,10 +977,10 @@ msgstr "_Kategorier..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1011,15 +1028,15 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2003,102 +2020,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL øyeblikksmeldinger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Tjeneste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Lokasjon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Brukernavn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Hjemme"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2106,7 +2132,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette disse kontaktene?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2114,46 +2140,51 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette denne kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: «%s»"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Fullt navn:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_post:"
 
@@ -2309,11 +2340,11 @@ msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
@@ -2402,13 +2433,13 @@ msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
@@ -2425,98 +2456,97 @@ msgid "Type"
 msgstr "Type"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Address Book Sources..."
 msgstr "Adressebok-kilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Innstillinger for pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Copy to Address Book..."
 msgstr "Kopier til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 msgid "Move to Address Book..."
 msgstr "Flytt til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktiv visning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2529,8 +2559,8 @@ msgstr ""
 "igjen"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -2573,7 +2603,7 @@ msgid "Company Phone"
 msgstr "Firmatelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2632,7 +2662,7 @@ msgid "Nickname"
 msgstr "Kallenavn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2641,7 +2671,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -2767,61 +2797,67 @@ msgstr "Valgt"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr "(kart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr "kart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr "arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr "Stilling"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Hjemmeside"
 
@@ -2830,8 +2866,8 @@ msgid "Success"
 msgstr "Suksess"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2861,7 +2897,7 @@ msgstr "Protokollen er ikke støttet"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2881,7 +2917,8 @@ msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3015,7 +3052,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Legg til adresse for eksisterende kontakt «%s»"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Kjører spørring i adressebok..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3070,17 +3108,40 @@ msgstr "Opphavsrett © 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Import fra Elm for Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar-import"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar-import"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
@@ -3172,7 +3233,7 @@ msgstr "Marger"
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3348,8 +3409,8 @@ msgstr "Ingen filnavn spesifisert."
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Oppgi passord"
 
@@ -3426,10 +3487,9 @@ msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -3473,26 +3533,26 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Åpne"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Åpne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "_Se bort fra"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "Se bort fra _alle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3505,12 +3565,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3522,7 +3582,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3539,19 +3599,19 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
@@ -3687,24 +3747,30 @@ msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Beskrivelse inneholder"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3733,7 +3799,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3755,70 +3821,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalender «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
@@ -3950,7 +4016,7 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
@@ -4022,7 +4088,7 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4033,7 +4099,7 @@ msgstr "start på avtale"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktivert"
 
@@ -4083,7 +4149,7 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Advarsler"
 
@@ -4108,7 +4174,7 @@ msgid "Days"
 msgstr "Dager"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_ktiver"
 
@@ -4248,7 +4314,7 @@ msgid "_Fri"
 msgstr "_Fr."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Generell"
 
@@ -4346,7 +4412,7 @@ msgstr ""
 "oppgitt her."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
@@ -4514,23 +4580,23 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Ferdig "
 
@@ -4566,8 +4632,8 @@ msgstr "Journaloppføring - %s"
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Lagre som..."
 
@@ -4595,10 +4661,21 @@ msgstr "Kunne ikke åpne destinasjon"
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Velg målkilde"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Ny oppgaveliste"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4701,7 +4778,7 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -4725,23 +4802,32 @@ msgstr "Møteplanlegging"
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Ferdigdato er før startdato!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
@@ -4817,29 +4903,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -5025,7 +5111,7 @@ msgstr "den"
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -5058,7 +5144,7 @@ msgid "_No recurrence"
 msgstr "I_ngen gjeninntreffelse"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -5100,7 +5186,7 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
@@ -5124,7 +5210,7 @@ msgstr "Informasjon om oppgavetildeling er opprettet. Send den?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
@@ -5137,7 +5223,7 @@ msgstr "% _fullført"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Fullført"
 
@@ -5150,7 +5236,7 @@ msgstr "Høy"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Under arbeid"
 
@@ -5169,7 +5255,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -5208,16 +5294,16 @@ msgstr "Grunnleggende"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Ferdigdato er før startdato!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -5228,7 +5314,7 @@ msgstr "Ko_nfidensiell"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5412,11 +5498,10 @@ msgstr "Startdato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "farge"
 
@@ -5441,7 +5526,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Ø"
 
@@ -5476,10 +5561,10 @@ msgstr "Nei"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjent"
@@ -5492,99 +5577,105 @@ msgstr "Gjeninntreffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Åpne"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
@@ -5671,7 +5762,7 @@ msgid "Alarms"
 msgstr "Alarmer"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Fullført"
 
@@ -5729,26 +5820,26 @@ msgstr "%02i minutters oppdeling"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5931,7 +6022,7 @@ msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -6385,12 +6476,12 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6400,7 +6491,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6411,12 +6502,12 @@ msgstr ""
 "%s\n"
 " har krasjet."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6425,28 +6516,38 @@ msgstr ""
 "Feil under åpning av «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Laster oppgaver"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Avtale - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6567,16 +6668,16 @@ msgstr "Ledig/opptatt-informasjon (%s til %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Oppgi passordet for «%s»"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6588,7 +6689,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6600,12 +6701,12 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "På nettet"
 
@@ -6794,49 +6895,49 @@ msgstr "Valgt måned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Oppgave"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
@@ -6846,36 +6947,36 @@ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Oppgaveliste «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Oppgaveliste"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
@@ -8614,7 +8715,7 @@ msgstr "Kan ikke åpne melding"
 msgid "Failed on message %d"
 msgstr "Feilet på melding %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
@@ -8699,7 +8800,7 @@ msgstr "Kopierer meldinger"
 msgid "Filtering new message(s)"
 msgstr "Filtrerer ny(e) melding(er)"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8710,15 +8811,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8727,30 +8828,26 @@ msgstr ""
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Ingen data gitt"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8761,60 +8858,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjøring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjøring av gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunne ikke generere krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
@@ -8924,21 +9021,34 @@ msgstr "Klarte ikke å dekryptere MIME-del: ugyldig struktur"
 msgid "parse error"
 msgstr "lesefeil"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "E-post-tilbyder for virtuelle mapper"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunne ikke laste %s: Modullasting er ikke støttet på dette systemet."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Ingen tilbyder tilgjengelig for protokoll «%s»"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonym"
@@ -9089,7 +9199,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
@@ -9226,20 +9336,7 @@ msgstr "Vertsoppslag feilet: vert ikke funnet"
 msgid "Host lookup failed: unknown reason"
 msgstr "Vertsoppslag feilet: ukjent årsak"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "E-post-tilbyder for virtuelle mapper"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Ingen tilbyder tilgjengelig for protokoll «%s»"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9302,21 +9399,25 @@ msgstr "Signeringspart: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Kan ikke opprette mappe: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Søppel"
@@ -9551,21 +9652,31 @@ msgstr "Ingen slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9581,14 +9692,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Bruk filtre for nye meldinger i Innboks på denne tjeneren"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Synkroniser eksterne meldinger med lokale meldinger automatisk"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Adressebok"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "Navn på LDAP-tjener:"
@@ -9606,44 +9713,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For å aksessere Novell Groupwise-tjenere"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Passord"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
 "passord."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Forvalgt"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "liste"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9652,26 +9757,26 @@ msgstr ""
 "Melding fra IMAP-tjener %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar «OK» fra IMAP-tjener: %s"
@@ -9686,7 +9791,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 
@@ -9695,12 +9800,12 @@ msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9716,25 +9821,25 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -9789,27 +9894,37 @@ msgstr "Navneområde"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filtre for nye meldinger i INNBOKS på denne tjeneren"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Se etter nye meldinger i alle mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Se etter nye meldinger i alle mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9818,64 +9933,64 @@ msgstr "IMAP-tjeneste for %s på %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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 avbrutt"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9886,24 +10001,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Kan ikke opprette mappe: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
@@ -9928,7 +10051,7 @@ msgstr ""
 "\n"
 " !!! IKKE BRUK DENNE I PRODUKSJON !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kunne ikke koble til POP-tjener på %s"
@@ -10010,8 +10133,8 @@ msgstr ""
 "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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10023,55 +10146,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Kunne ikke slette metadatafil for mappe «%s»: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke lagre sammendrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
@@ -10089,53 +10212,44 @@ msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke åpne mappe «%s»:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappen «%s» eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke opprette mappe «%s»:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "«%s» er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10157,9 +10271,9 @@ msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Lagrer mappe"
@@ -10203,156 +10317,134 @@ msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke åpne fil «%s»:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Kan ikke opprette en mappe med dette navnet."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke opprette katalog «%s»:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Kunne ikke opprette fil «%s»\n"
+"Kunne ikke slette mappen «%s»\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "«%s» er ikke en vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke slette mappen «%s»\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen «%s» er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Kan ikke opprette en mappe med dette navnet."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikke opprette katalog «%s»: %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenavnet er ugyldig."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke endre navn på «%s» til %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke åpne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke åpne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke lagre mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
@@ -10366,10 +10458,17 @@ msgstr "Operasjon for å legge til melding for MH avbrutt"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Kunne ikke opprette mappe «%s»:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "«%s» er ikke en katalog."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Finner ikke mappe: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10391,6 +10490,29 @@ msgstr "Spool «%s» er ikke en vanlig fil eller katalog"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen «%s/%s» eksisterer ikke."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Kan ikke åpne mappe «%s»:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mappen «%s» eksisterer ikke."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kunne ikke opprette mappe «%s»:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10627,46 +10749,46 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Du kan ikke fjerne en mappe i et News-lager: slett abonnement i stedet."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Tilkoblingsfeil: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ingen slik mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kunne ikke hente gruppe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Kunne ikke hente meldinger: uspesifisert feil"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-kommando feilet: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Søker etter nye meldinger"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukjent svar fra tjener: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Bruk avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
@@ -10713,7 +10835,7 @@ msgstr "Slett etter %s dag(er)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Slå av støtte for alle POP3-utvidelser"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10803,7 +10925,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10857,7 +10979,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11023,7 +11145,7 @@ msgstr "SMTP e-postlevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -11130,34 +11252,34 @@ msgstr "Tidsavbrudd for QUIT-forespørsel: %s"
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
@@ -11273,14 +11395,14 @@ msgstr "Klikk her for å velge mapper å poste til"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Kan ikke signere utgående melding: ingen sertifikat for signering satt for "
 "avsenderkonto"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11288,7 +11410,7 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "avsenderkonto"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11297,30 +11419,30 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11329,7 +11451,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11338,7 +11460,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11347,7 +11469,7 @@ msgstr ""
 "Kunne ikke kopiere fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11356,7 +11478,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11364,7 +11486,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11375,43 +11497,43 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11419,7 +11541,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11431,7 +11553,7 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt\n"
 "versjon av gtkhtml og libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11439,7 +11561,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke å aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11792,7 +11914,7 @@ msgstr "Så"
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Velg mappe"
@@ -11807,19 +11929,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Senere"
 
@@ -11907,7 +12029,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden da filtreringen skjer."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -11923,7 +12045,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr " sekunder"
 
@@ -12092,7 +12214,7 @@ msgstr "er ikke merket"
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12198,9 +12320,10 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Emne"
 
@@ -12208,25 +12331,25 @@ msgstr "Emne"
 msgid "Unset Status"
 msgstr "Nullstill status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnavn «%s» er ikke unikt. Velg et annet navn."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Regelnavn"
 
@@ -12266,15 +12389,15 @@ msgstr "Emne inneholder"
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Du må gi navn til denne vfolderen."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må spesifisere minst en mappe som kilde."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
@@ -12324,9 +12447,9 @@ msgstr "Komponent for mappevisning for Evolution e-post"
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "E-post"
 
@@ -12334,7 +12457,7 @@ msgstr "E-post"
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
@@ -12372,15 +12495,15 @@ msgstr "Du må oppgi et gyldig navn på skriptet."
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Legg til skriptsignatur"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -12464,7 +12587,6 @@ msgid "Unread messages"
 msgstr "Uleste meldinger"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
@@ -12472,292 +12594,310 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "På denne datamaskinen"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFoldere"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Laster..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kunne ikke slette mappe: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappe «%s» og alle dens undermapper?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett «%s»"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «%s» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Flytt"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Merk som _ikke søppel"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsender i adresse_bok"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "VFolder for tråd"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtrer på tråd"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Forvalgt"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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 avsender av "
 "meldingen er autentisk."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 "Denne meldingen er signert og gyldig. Avsender av denne meldingen er høyst "
 "sannsynlig den den påstår at den er."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12765,11 +12905,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12777,11 +12917,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12789,11 +12929,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan ses under overføring over "
 "Internett."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12803,11 +12943,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12815,11 +12955,11 @@ 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12828,35 +12968,35 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
@@ -12899,29 +13039,34 @@ msgstr "Peker til ukjente eksterne data («%s»-type)"
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -12935,8 +13080,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -12953,19 +13098,24 @@ msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
 
@@ -12981,56 +13131,56 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Feil under migrering av uid-buffer for pop3: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Feil under migrering av utvidelsestilstand for mappe: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Klarte ikke å opprette katalog «%s»: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Klarte ikke å åpne lager for «%s»: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -13078,17 +13228,17 @@ msgstr "Filtre"
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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-utils.c:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13097,7 +13247,7 @@ msgstr ""
 "Kan ikke lagre til «%s»\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13106,29 +13256,35 @@ msgstr ""
 "«%s» eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "melding"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Feil: «%s» eksisterer og er ikke en vanlig fil"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Legg til adresse"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "E-post fra %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13141,7 +13297,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13166,197 +13322,211 @@ msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Sjekk om innkommende meldinger er søppel for IMAP-kontoer"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Farge for utheving av sitattekst"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Farge for utheving av sitattekst."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Forvalgt høyde for meldingsvinduet"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Forvalgt bredde for meldingsvinduet"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Last bilder for HTML-meldinger og http"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Lydfil for varsel om ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Type varsel for ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13364,98 +13534,92 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Vis forhåndsvisningsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Vis forhåndsvisningsvinduet."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Lydfil som skal spilles av når nye meldinger ankommer."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Skrift med variabel bredde for meldingsvisning"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13463,167 +13627,164 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Bruk meldingsliste med tråder."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Bruk meldingsliste med tråder"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "port for spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "mbox-import for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (.mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Import av Netscape e-post for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Import fra Outlook Express 4 for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "mbox-import for 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importerer %s som %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Søker i %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importerer filer"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13631,16 +13792,44 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Destinasjonen er skrivebeskyttet"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Velg et sertifikat som skal importeres..."
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importerer %s.\n"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importerer filer"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Søker i %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13655,7 +13844,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13663,7 +13852,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13672,31 +13861,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Skanner e-postfiltre"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Søker i katalog"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Starter import"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "E-post filtre"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13704,11 +13886,20 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importerer filer"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adressebok"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13716,7 +13907,7 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13759,19 +13950,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "S_ti:"
 
@@ -13823,27 +14014,42 @@ msgstr ""
 "    «%s»\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Ny VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-post filtre"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Opprett en ny kalender"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "URI for e-postkilden som visningen skal vise"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
 
@@ -13886,7 +14092,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
@@ -13913,119 +14119,115 @@ msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Søk etter støttede typer"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL er ikke støttet i denne versjonen av Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke støttet i denne versjonen av evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Meldingshoder som vises</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Send krypterte me_ldinger til meg selv også ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Legg til sk_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Legg til ny signatur..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Alltid _blindkopi (Bcc) til:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Alltid _kopi (Cc) til:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "F_arger"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Sjekk _innkommende meldinger"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende meldinger er søppel"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14041,278 +14243,274 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Forvalgt oppførsel"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Forvalgt t_egnkoding:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Sletter meldinger"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Signer utgående meldinger digitalt (forvalg)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "Ikke sjekk i_nnkommende meldinger for IMAP-kontoer"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-post _adresse:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm søppelkurven ved slutt"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Alternativer for filter"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Meldingshod_er"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiketter og farger"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Skrift for melding"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Melding om ny e-post"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Skrifter ved utskrift"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "H_usk dette passordet"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Alternativer for m_ottak"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Husk dette _passordet"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Gjenopprett forvalg"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Sikk_erhet"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Sertifikat for si_gnering:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Stave_kontroll"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14322,7 +14520,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14331,7 +14529,7 @@ msgstr ""
 "Denne siden lar deg konfigurere oppførsel for stavekontroll og språk. "
 "Språklisten her reflekterer kun de språkene du har installert en ordbok for."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14339,15 +14537,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Bruk _daemon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14357,171 +14555,171 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Sjekk etter nye meldinger _automatisk hvert"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Sett inn emotikoner _automatisk"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekreft ved tømming av mappe"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Forvalgt signatur:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Forvalg"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Aktiver"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Krypt_er utgående meldinger (som forvalg)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML e-post"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Søppel"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Kun _lokale tester"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Velg..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Ut_sending av e-post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Forvalgt skrift:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminalskrift:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker forbindelse (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre applikasjoner"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -14544,7 +14742,7 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Arbeider"
 
@@ -14556,12 +14754,12 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14570,116 +14768,116 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14688,7 +14886,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14697,11 +14895,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14710,22 +14908,22 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Endrer søppelstatus"
 
@@ -14757,38 +14955,38 @@ msgstr "Kryptering"
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tjener: %s, Type: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Venter..."
 
@@ -14895,20 +15093,20 @@ msgstr ""
 "    «%s»\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver å redigere en vfolder «%s» som ikke eksisterer."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
@@ -15221,97 +15419,20 @@ msgstr "Frakoblede mapper"
 msgid "Autocompletion Folders"
 msgstr "Autofullføringsmapper"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Kan ikke kopiere mappe: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Kunne ikke flytte mappe: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Kan ikke flytte en mappe over seg selv."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Kan ikke kopiere en mappe oppå seg selv."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Spesifiser en mappe som mappen «%s» skal kopieres til:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopier mappe"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Spesifiser en mappe å flytte mappen «%s» til:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Flytt mappe"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Kunne ikke slette mappe:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Vild du virkelig slette mappe «%s»?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Kunne ikke endre navn på mappe:\n"
+"Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Spesifisert mappenavn er ikke gyldig: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Valgt mappe tilhører ikke en annen bruker"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Kan ikke fjerne mappe:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan ikke opprette spesifisert katalog:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uten navn)"
@@ -15449,7 +15570,7 @@ msgstr "Kan ikke kjøre importprogram"
 msgid "_Import"
 msgstr "_Importer"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
@@ -15487,6 +15608,10 @@ msgstr "Kunne ikke åpne delt mappe: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke finne spesifisert delt mappe."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Starter import"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15605,123 +15730,6 @@ msgstr "Konfigurasjonsdatabase ikke funnet"
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Opprett ny snarveigruppe"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Gruppenavn:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Vil du virkelig fjerne gruppen «%s» fra snarveilinjen?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Endre navn på snarveigruppen"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Endre valgt snarveigruppe til:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Vis snarveier som små ikoner"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Store i_koner"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Vis snarveier som store ikoner"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Legg til gruppe..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Opprett en ny snarveigruppe"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Fje_rn denne gruppen..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Fjern denne snarveigruppen"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "E_ndre navn på denne gruppen..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Endre navn på denne snarveigruppen"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Sk_jul snarveilinjen"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Skjul snarveilinjen"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Opprett _forvalgte snarveier"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Opprett forvalgte snarveier"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Endre navn på snarvei"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Endre navn på valgt snarvei til:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Åpne mappen som er lenket til denne snarveien"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Åpne i nytt _vindu"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Åpne mappen som er lenket til denne snarveien i et nytt vindu"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Endre navn på denne snarveien"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Fjern"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Fjern denne snarveien fra snarveilinjen"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Feil under lagring av snarveier."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Snarveier"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Avkryssingsboks"
@@ -15732,11 +15740,6 @@ msgstr "Avkryssingsboks"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» i «%s»"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16028,45 +16031,45 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Utgår"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Oppgi passord for «%s»"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16075,7 +16078,7 @@ msgstr ""
 "Utstedt til:\n"
 "  Subjekt: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16140,7 +16143,7 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Sertifikat"
 
@@ -16205,11 +16208,11 @@ msgstr "Organisasjonsenhet (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
@@ -16255,210 +16258,210 @@ msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Versjon"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Versjon 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Versjon 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Signering"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen informasjon"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Kritisk"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Oppgi passord for PKCS12-fil:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
@@ -17045,7 +17048,8 @@ msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17053,7 +17057,8 @@ msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Legg til avsender i adressebok"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17498,10 +17503,6 @@ msgstr "For_mat"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Åpne"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Åpne en fil"
@@ -17862,22 +17863,6 @@ msgstr "_Send / motta"
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Skriv ut sammendrag"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Skriv ut sammendrag"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Oppdater"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Oppdater visningen"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
@@ -17938,8 +17923,8 @@ msgstr "Med _kategori"
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18180,23 +18165,23 @@ msgstr "_Søk"
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID for underoppføring"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Finn _nå "
 
@@ -18209,3 +18194,210 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
+
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressebok-kilder"
+
+#~ msgid "No data provided"
+#~ msgstr "Ingen data gitt"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke åpne fil «%s»:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke opprette katalog «%s»:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke opprette fil «%s»\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "«%s» er ikke en katalog."
+
+#~ msgid "On this Computer"
+#~ msgstr "På denne datamaskinen"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Sjekk om innkommende meldinger er søppel for IMAP-kontoer"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importerer %s som %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Skanner e-postfiltre"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Søker i katalog"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "Ikke sjekk i_nnkommende meldinger for IMAP-kontoer"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Kan ikke kopiere mappe: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Kunne ikke flytte mappe: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Kan ikke flytte en mappe over seg selv."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Kan ikke kopiere en mappe oppå seg selv."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Spesifiser en mappe som mappen «%s» skal kopieres til:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopier mappe"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Spesifiser en mappe å flytte mappen «%s» til:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Flytt mappe"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke slette mappe:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Vild du virkelig slette mappe «%s»?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke endre navn på mappe:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Valgt mappe tilhører ikke en annen bruker"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke fjerne mappe:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Opprett ny snarveigruppe"
+
+#~ msgid "Group name:"
+#~ msgstr "Gruppenavn:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Vil du virkelig fjerne gruppen «%s» fra snarveilinjen?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Endre navn på snarveigruppen"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Endre valgt snarveigruppe til:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Små ikoner"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Vis snarveier som små ikoner"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Store i_koner"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Vis snarveier som store ikoner"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Legg til gruppe..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Opprett en ny snarveigruppe"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Fje_rn denne gruppen..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Fjern denne snarveigruppen"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "E_ndre navn på denne gruppen..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Endre navn på denne snarveigruppen"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Sk_jul snarveilinjen"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Skjul snarveilinjen"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Opprett _forvalgte snarveier"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Opprett forvalgte snarveier"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Endre navn på snarvei"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Endre navn på valgt snarvei til:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Åpne mappen som er lenket til denne snarveien"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Åpne i nytt _vindu"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Åpne mappen som er lenket til denne snarveien i et nytt vindu"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Endre navn på denne snarveien"
+
+#~ msgid "Re_move"
+#~ msgstr "_Fjern"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Fjern denne snarveien fra snarveilinjen"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Feil under lagring av snarveier."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Snarveier"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "«%s» i «%s»"
+
+#~ msgid "Print Summary"
+#~ msgstr "Skriv ut sammendrag"
+
+#~ msgid "Print summary"
+#~ msgstr "Skriv ut sammendrag"
+
+#~ msgid "Reload"
+#~ msgstr "Oppdater"
+
+#~ msgid "Reload the view"
+#~ msgstr "Oppdater visningen"
diff --git a/po/pl.po b/po/pl.po
index eeea3e50b3..25df6d332b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -54,8 +54,7 @@ msgstr "Konfiguracja automatycznego uzupełniania"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -95,20 +94,21 @@ msgstr "Kontrola konfiguracji ustawień folderu Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Zarządzanie certyfikatami S/Mime"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Książka adresowa \"%s\" zostanie usunięta. Czy na pewno chcesz kontynuować?"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -116,66 +116,66 @@ msgstr "Nowa książka adresowa"
 msgid "Delete"
 msgstr "Usuń"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Właściwości..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nowa lista kontaktów"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Lista _kontaktów"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Tworzy nową listę kontaktów"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Nie można nawiązać połączenia z serwerem LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Nie można wykonać zapytania na głównym DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Błąd przy pobieraniu informacji o schemacie"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migracja..."
 
@@ -192,39 +192,41 @@ msgstr ""
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrowanie \"%s\":"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Na tym komputerze"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Osobiste"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Na serwerze LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "Serwery LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Ustawienia autouzupełniania"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -237,7 +239,7 @@ msgstr ""
 "Spróbuj doprecyzować zapytanie lub zwiększ limit w ustawieniach serwera "
 "katalogowego, powiązanego z tą książką adresową."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -249,22 +251,22 @@ msgstr ""
 "swoje zapytanie lub zwiększ limit czasowy w preferencjach\n"
 "serwera katalogowego obsługującego tą książkę adresową."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Zapytanie nie zakończyło się pomyślnie."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -272,7 +274,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Upewnij się, że ścieżka istnieje "
 "oraz że ma ustawione odpowiednie uprawnienia dostępu."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -280,7 +282,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera LDAP."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -290,7 +292,7 @@ msgstr ""
 "wykorzystać LDAP, należy pobrać OpenLDAP spod podanego poniżej adresu i "
 "ponownie skompilować Evolution ze źródeł dostępnych w CVS."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -298,27 +300,32 @@ 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Nie można otworzyć książki adresowej"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimowy dostęp do serwera LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Nie można dokonać uwierzytelnienia.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID źródła kontkatów wyświetlany przez widok"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI wyświetlany przez kalendarz"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "XML EFolderList dla listy uzupełniania adresów URI"
@@ -364,7 +371,7 @@ msgstr " Wyświ_etl obsługiwane typy "
 #: 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:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -396,19 +403,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Asystent tworzenia książki adresowej"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Właściwości książki adresowej"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Źródła książki adresowej"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Źródła książki adresowej..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Zawsze"
 
@@ -417,8 +427,10 @@ msgid "Anonymously"
 msgstr "Anonimowo"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -426,53 +438,53 @@ msgstr ""
 "\n"
 "Kliknij przycisk \"Zakończ\" aby zapisać wprowadzone ustawienia."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Nawiązywanie połączenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Wyróżniona nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Zakończone"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nigdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -488,23 +500,23 @@ msgstr ""
 "niektóre serwery do kryptograficznego zabezpieczenia połączeń. Zapytaj\n"
 "administratora używanego serwera LDAP, czy korzysta on z tych protokołów."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Zakres wyszukiwania: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Wybrano:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -513,7 +525,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -531,7 +543,7 @@ msgstr ""
 "musi\n"
 "wykorzystywać protokołów SSL/TLS, gdyż twoje połączenie jest już bezpieczne."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -545,7 +557,7 @@ msgstr ""
 "będą podatne\n"
 "na ewentualne ataki z zewnątrz."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -556,40 +568,42 @@ msgstr ""
 "Evolution,\n"
 "dotyczących przeszukiwania LDAP oraz tworzenia i modyfikowania kontaktów. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Określenie wyświetlanej nazwy i grupy jest pierwszym krokiem związanym z "
 "konfiguracją książki adresowej."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Krok 1: Charakterystyka folderu"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Krok 2: Informacje o serwerze"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Krok 3: Nawiązywanie połączenia z serwerem"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Krok 4: Przeszukiwanie katalogu"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Podrzędne"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Obsługiwane podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -602,7 +616,7 @@ msgstr ""
 "Zapytaj swojego administratora systemu, czy zachodzi konieczność zmiany\n"
 "tych opcji."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -613,7 +627,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -628,11 +642,13 @@ msgstr ""
 "Zakres wyszukiwania \"one\" dołączy tylko wpisy leżące poziom ponad\n"
 "podstawą wyszukiwania.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -643,23 +659,24 @@ msgstr ""
 "systemu, jeśli potrzebna jest pomoc przy wyszukiwaniu tych\n"
 "informacji."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Jest to maksymalna liczba pobieranych pozycji. Zbytnie zwiększenie tej "
 "liczby\n"
 "spowoduje spowolnienie działania książki adresowej."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -669,7 +686,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -678,7 +695,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -687,7 +704,7 @@ msgstr ""
 "Jest to nazwa która będzie widoczna na liście folderów Evolution. Nazwa ta "
 "przeznaczona jest tylko do wyświetlania."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -698,28 +715,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Uży_cie SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Użycie wyróżnionej nazwy (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Użycie adresu e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kiedy możliwe"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -731,19 +748,19 @@ msgstr ""
 "oraz danych logowania. Zapytaj swojego administratora systemu, jeśli nie "
 "masz pewności, jakie informacje powinny zostać wprowadzone."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Wyświetlana nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Limit pobierania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -752,39 +769,39 @@ msgstr "_Limit pobierania:"
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Metoda logowania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "Numer p_ortu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Czas oczekiwania (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "zakładka-nawiązywanie połączenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "zakładka-ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "zakładka-wyszukiwanie"
 
@@ -899,7 +916,7 @@ msgstr "Współpraca"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
@@ -993,10 +1010,10 @@ msgstr "_Kategorie..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1044,15 +1061,15 @@ msgid "_Web page address:"
 msgstr "Adres strony sieci _Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2036,67 +2053,76 @@ msgid "AOL Instant Messenger"
 msgstr "Komunikator internetowy AOL"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Komunikator MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Usługa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Położenie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Dom"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Praca"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Książka źródłowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Książka docelowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2104,35 +2130,35 @@ msgid "Contact"
 msgstr "Kontakt"
 
 # FIXME - trzeba zobaczyć czy jest dobrze
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Jest nowym kontaktem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Pola do zapisu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Zmienione"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nazwa konta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Edytor kategorii nie jest dostępny."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 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:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Zapis kontaktu w formacie VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2140,7 +2166,7 @@ msgstr ""
 "Czy na pewno chcesz\n"
 "usunąć te kontakty?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2148,46 +2174,51 @@ msgstr ""
 "Czy na pewno chcesz\n"
 "usunąć ten kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Praca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaktu"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Pełna edycja"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Peł_na nazwa:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "_E-mail"
 
@@ -2344,11 +2375,11 @@ msgid "Is New List"
 msgstr "Jest nową listą"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Edytor listy kontaktów"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Zapisz listę w formacie VCard"
 
@@ -2437,13 +2468,13 @@ msgid "Email begins with"
 msgstr "E-mail rozpoczyna się od"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorią jest"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
@@ -2460,101 +2491,100 @@ msgid "Type"
 msgstr "Rodzaj"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Zapisz w formacie VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Nowy kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nowa lista kontaktów..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Przejdź do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Zaimportuj..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Szukaj kontaktów..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Źródła książki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Ustawienia Pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prześlij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Wyślij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Wydrukuj kopertę"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Książka adresowa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Książka adresowa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Skopiuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Bieżący widok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2567,8 +2597,8 @@ msgstr ""
 "uruchomić Evolution."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
@@ -2611,7 +2641,7 @@ msgid "Company Phone"
 msgstr "Telefon firmowy"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mail"
 
@@ -2670,7 +2700,7 @@ msgid "Nickname"
 msgstr "Pseudonim"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Notatka"
 
@@ -2679,7 +2709,7 @@ msgid "Office"
 msgstr "Biuro"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -2805,67 +2835,73 @@ msgstr "Wybrano"
 msgid "Has Cursor"
 msgstr "Posiada kursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Członkowie listy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Praca"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Opis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "Adres URL konferencji w_ideo:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Osobiste"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Tytuł służbowy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Witryna domowa"
 
@@ -2874,8 +2910,8 @@ msgid "Success"
 msgstr "Sukces"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2905,7 +2941,7 @@ msgstr "Protokół nie jest obsługiwany"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2925,7 +2961,8 @@ msgid "TLS not Available"
 msgstr "TLS nie jest dostępny"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Książka adresowa nie istnieje"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3060,7 +3097,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adres do istniejącego kontaktu \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Sprawdzanie książki adresowej..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3115,17 +3153,40 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Powinno to przetestować element przeformatowania"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Importer Elm Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Druid importu plików iCalendar dla Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Druid importu plików vCalendar dla Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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 "Wydrukuj koportę"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Wydrukuj kontakty"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Wydrukuj kontakt"
 
@@ -3217,7 +3278,7 @@ msgstr "Marginesy"
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcje"
 
@@ -3398,8 +3459,8 @@ msgstr "Nie podano nazwy pliku."
 msgid "Unnamed List"
 msgstr "Lista kontaktów bez nazwy"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Wprowadź hasło"
 
@@ -3476,10 +3537,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponent zadań Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Zadania"
 
@@ -3523,26 +3583,26 @@ msgstr "Czas uśpienia (minuty)"
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Otwórz"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Otwórz"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "_Zamknij"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "Zamknij _wszystko"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3555,12 +3615,12 @@ msgstr ""
 "Rozpoczęcie o %s\n"
 "Zakończenie o %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3572,7 +3632,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3589,19 +3649,19 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomić ten program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Nie można zainicjować Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie można zainicjować gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie można utworzyć generatora usługi przypominania za pomocą alarmu"
 
@@ -3739,24 +3799,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Zestawienie zawiera"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Opis zawiera"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -3786,7 +3852,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3808,71 +3874,71 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Spot_kanie"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o spotkanie"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Nowe termin całodniowy"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin całodniowy"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "K_alendarz"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, 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:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Brak dostępnego kalendarza do utworzenia zdarzeń i spotkań"
 
@@ -4005,7 +4071,7 @@ msgid "minutes"
 msgstr "minut"
 
 # FIXME - nie mam koncepci na trigger/spust?
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Akcja/Uaktywnienie"
 
@@ -4077,7 +4143,7 @@ msgid "hour(s)"
 msgstr "godzin"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4088,7 +4154,7 @@ msgstr "początek terminu"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktywne"
 
@@ -4138,7 +4204,7 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alarmy"
 
@@ -4163,7 +4229,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "U_aktywnij"
 
@@ -4303,7 +4369,7 @@ msgid "_Fri"
 msgstr "_Pią"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "Ogó_lne"
 
@@ -4402,7 +4468,7 @@ msgstr ""
 "Kliknij przycisk \"Zakończ\" aby zapisać wprowadzone ustawienia."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Nowa lista zadań"
 
@@ -4572,23 +4638,23 @@ msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
 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:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Zakończone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Zakończone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Należne "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Należne "
 
@@ -4624,8 +4690,8 @@ msgstr "Wpis dziennika - %s"
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
@@ -4654,10 +4720,21 @@ msgid "Destination is read only"
 msgstr "Cel jest tylko do odczytu"
 
 # FIXME - co za bzdurne zdanie
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Podaj źródło celu"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendarz"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Nowa lista zadań"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4760,7 +4837,7 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Termin"
 
@@ -4784,23 +4861,32 @@ msgstr "Planowanie"
 msgid "Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Data docelowa jest wcześniejsza niż data rozpoczęcia!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Data początkowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Data końcowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Czas początkowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Czas końcowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nie można otworzyć kalendarza \"%s\"."
@@ -4876,29 +4962,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Wybrany organizator nie posiada już konta."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -5084,7 +5170,7 @@ msgstr "w"
 msgid "occurrences"
 msgstr "wystąpienia"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Data/Czas"
 
@@ -5118,7 +5204,7 @@ msgid "_No recurrence"
 msgstr "_Brak powtarzalności"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Usuń"
 
@@ -5160,7 +5246,7 @@ msgstr ""
 "\n"
 "Czy chcesz zapisać wprowadzone zmiany?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Porzuć zmiany"
 
@@ -5184,7 +5270,7 @@ msgstr "Została utworzona informacja o przypisaniu zadania. Czy wysłać ją?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacje o zadaniu zostały zmienione. Czy wysłać aktualną wersję?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Data zakończenia jest niepoprawna"
 
@@ -5198,7 +5284,7 @@ msgstr "% _ukończone"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Zakończone"
 
@@ -5211,7 +5297,7 @@ msgstr "Wysoki"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "W trakcie"
 
@@ -5230,7 +5316,7 @@ msgstr "Zwykły"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nie uruchomiony"
 
@@ -5269,16 +5355,16 @@ msgstr "Proste"
 msgid "Assignment"
 msgstr "Przyporządkowanie"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Data docelowa jest niepoprawna"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Data docelowa jest wcześniejsza niż data rozpoczęcia!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie można otworzyć zadań w \"%s\"."
@@ -5289,7 +5375,7 @@ msgstr "Taj_ny"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5473,11 +5559,10 @@ msgstr "Data rozpoczęcia"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "kolor"
 
@@ -5502,7 +5587,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5537,10 +5622,10 @@ msgstr "Nie"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nieznany"
@@ -5553,99 +5638,105 @@ msgstr "Powtarzanie"
 msgid "Assigned"
 msgstr "Przyporządkowano"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Aktualizowanie obiektów"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _całodniowe"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Przejdź do d_zisiaj"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Przejdź do daty..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informację o zajętości"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Otwórz"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj spotkanie..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "Prześlij w formacie i_Calendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Usuń to _wystąpienie"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Usuń w_szystkie wystąpienia"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Ustawienia..."
 
@@ -5732,7 +5823,7 @@ msgid "Alarms"
 msgstr "Alarmy"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Gotowe"
 
@@ -5790,26 +5881,26 @@ msgstr "%02i-minutowe przedziały czasu"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5992,7 +6083,7 @@ msgid "Send Latest Information"
 msgstr "Wysłanie najświeższej informacji"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
@@ -6449,12 +6540,12 @@ msgstr "Priorytet:"
 msgid "Web Page:"
 msgstr "Strona web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknij, aby otworzyć %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6464,7 +6555,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6475,12 +6566,12 @@ msgstr ""
 "%s\n"
 " spowodowało błąd."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zadań z %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6489,28 +6580,38 @@ msgstr ""
 "Błąd przy otwieraniu %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Wczytywanie zadań"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Wykańczanie zadań..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiektów..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Wczytywanie zadań"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Termin - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6632,16 +6733,16 @@ msgstr "Informacja o zajętości (od %s do %s)"
 msgid "iCalendar information"
 msgstr "Informacja w formacie iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Musisz należeć do uczestników zdarzenia."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Wprowadź hasło dla %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6653,7 +6754,7 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6665,12 +6766,12 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Urodziny i rocznice"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Na sieci web"
 
@@ -6859,49 +6960,49 @@ msgstr "Wybrany miesiąc (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Stan: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorytet: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent zakończenia: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Podgląd wydruku"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
@@ -6910,37 +7011,37 @@ msgstr "Ustawienia wydruku"
 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:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Nowa lista zadań"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Lista zadań"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Tworzy nową listę zadań"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, 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:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
@@ -6998,20 +7099,20 @@ msgstr "Pliki iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Pliki vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Usuwa stare terminy i spotkania"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Przypomnienie!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Zdarzenia kalendarza"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7019,7 +7120,7 @@ msgstr ""
 "Odnaleziono pliki kalendarza GNOME.\n"
 "Czy chcesz zaimportować je do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Kalendarz GNOME"
 
@@ -8684,7 +8785,7 @@ msgstr "Nie można otworzyć listu"
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. liście"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
@@ -8769,7 +8870,7 @@ msgstr "Kopiowanie listów"
 msgid "Filtering new message(s)"
 msgstr "Filtrowanie nowych wiadomości"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8780,15 +8881,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Nie można rozpoznać ID użytkownika gpg."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nie można rozpoznać żądania podania hasła od GPG."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8797,31 +8898,27 @@ msgstr ""
 "Należy podać ciąg znaków odblokowujący klucz dla\n"
 "użytkownika: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nieoczekiwana odpowiedź od programu GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nie podano danych"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie można zaszyfrować listu: nie podano poprawnych odbiorców."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8833,60 +8930,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, 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:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nie można uruchomić gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Nie można uruchomić gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "To jest część listu podpisana cyfrowo"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nie można zweryfikować podpisu listu: Niepoprawny format wiadomości"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nie można wygenerować danych szyfrujących: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "To jest część listu zaszyfrowana cyfrowo"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Zaszyfrowana zawartość"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Nie można przeanalizować zawartości listu"
 
@@ -8999,21 +9096,34 @@ msgstr "Nie można odszyfrować części MIME: niepoprawna struktura"
 msgid "parse error"
 msgstr "błąd składniowy"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Dostarczyciel poczty dla folderów wirtualnych"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Do odczytu poczty jako zapytania na innym zbiorze folderów"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nie można załadować %s: System nie obsługuje ładowania modułów."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie można wczytać %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie można wczytać %s: Brak kodu inicjującego w module."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Brak dostawcy dla protokołu \"%s\""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimowo"
@@ -9177,7 +9287,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowiedź serwera na uwierzytelnienie."
 
@@ -9321,20 +9431,7 @@ msgstr "Nie można ustalić adresu odpowiadającego nazwie: nazwa nie istnieje"
 msgid "Host lookup failed: unknown reason"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: przyczyna nieznana"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Dostarczyciel poczty dla folderów wirtualnych"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Do odczytu poczty jako zapytania na innym zbiorze folderów"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Brak dostawcy dla protokołu \"%s\""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9398,23 +9495,27 @@ msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nie można pobrać folderu: Niepoprawna operacja na tym miejscu przechowywania"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Nie można utworzyć folderu: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie można utworzyć folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Śmieć"
@@ -9646,21 +9747,31 @@ msgstr "Brak listu %s w %s."
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie można zmienić nazwy folderu %s: Folder nie istnieje"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Nie można kopiować wiadomości z folderu NNTP!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Nie można kopiować wiadomości z folderu NNTP!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9677,14 +9788,10 @@ msgstr ""
 "Zastosowanie filtrów na nowych wiadomościach w Nadchodzących na tym serwerze"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatyczne synchronizowanie zdalnej poczty lokalnie"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Książka adresowa"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "Nazwa serwera LDAP:"
@@ -9702,44 +9809,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Dla dostępu do serwerów Novell GroupWise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Hasło"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Przy tej opcji połączenie z serwerem IMAP nastąpi przy użyciu hasła w "
 "postaci czystego tekstu."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Domyślne"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "lista"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwał połączenie: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9748,26 +9853,26 @@ msgstr ""
 "Alarm zgłoszony przez serwer IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowiedź od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiodło się polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Odpowiedź serwera zakończyła się zbyt wcześnie."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpowiedź serwera IMAP nie zawiera informacji %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowiedź OK od serwera IMAP: %s"
@@ -9782,7 +9887,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze został usunięty i utworzony ponownie."
 
@@ -9791,12 +9896,12 @@ msgstr "Folder na serwerze został usunięty i utworzony ponownie."
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych listów"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nie można pobrać listu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9812,25 +9917,25 @@ msgstr ""
 "Nie można pobrać listu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedostępny"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowujących nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nie można odnaleźć treści listu w odpowiedzi na FETCH."
 
@@ -9886,27 +9991,37 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Zastosowywanie filtrów w odniesieniu do nowych listów w INBOX na tym serwerze"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Sprawdzanie nowych listów we wszystkich folderach"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Sprawdzanie nowych listów we wszystkich folderach"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Serwer IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "usługa IMAP dla %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9915,65 +10030,65 @@ msgstr "usługa IMAP dla %s na %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono hasła."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9984,24 +10099,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Nie można utworzyć folderu: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Nazwa folderu \"%s\" jest niepoprawna, gdyż zawiera znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrzędny: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrzędny nie może zawierać folderów podrzędnych"
 
@@ -10027,7 +10150,7 @@ msgstr ""
 "\n"
 " !!! NIE NALEŻY TEGO UŻYWAĆ NA SYSTEMACH PRODUKCYJNYCH !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nie można nawiązać połączenia z serwerem POP %s"
@@ -10112,8 +10235,8 @@ msgstr ""
 "obsługiwanego przez programy Elm, Pine czy Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10127,55 +10250,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie można pobrać folderu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne miejsca przechowywania nie mają skrzynki nadchodzącej"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie można zmienić nazwy \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nie można usunąć meta pliku folderu \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie można zapisać zestawienia: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie można dodać listu do zestawienia: przyczyna nieznana"
 
@@ -10193,54 +10316,44 @@ msgstr "Nie można dołączyć listu do folderu w formacie maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawartość listu"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nie można otworzyć folderu \"%s\":\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Nie można pobrać folderu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Folder \"%s\" nie istnieje."
 
-# y, c-format
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nie można utworzyć folderu \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Nie można utworzyć folderu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" nie jest katalogiem z listami w formacie maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie można usunąć folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10262,9 +10375,9 @@ msgid "Checking for new messages"
 msgstr "Wyszukiwanie nowych listów"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Zapisywanie folderu"
@@ -10308,156 +10421,134 @@ msgstr "Folder jest uszkodzony w sposób uniemożliwiający naprawę."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Utworzenie listu nie powiodło się: Uszkodzona skrzynka?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nie można otworzyć pliku \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Nie można utworzyć folderu o tej nazwie."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nie można utworzyć katalogu \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Nie można załączyć pliku %s: to nie jest zwykły plik"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nie można utworzyć pliku \"%s\":\n"
+"Nie można usunąć folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwykłym plikiem."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nie można usunąć folderu \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie został usunięty."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Nie można utworzyć folderu o tej nazwie."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nie można utworzyć katalogu \"%s\": %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nie można utworzyć folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Folder już istnieje"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Nowa nazwa folderu jest niedozwolona."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nie można zmienić nazwy \"%s\": \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nie można zmienić nazwy folderu %s na %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie można otworzyć folderu %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Poważny błąd składniowy na pozycji %ld w folderze %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie można sprawdzić folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie można otworzyć pliku %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie można otworzyć tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie można zamknąć folderu źródłowego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie można zamknąć folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie można zmienić nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Niezgodność folderu z zestawieniem, nawet po synchronizacji"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany błąd: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie można zapisać folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Błąd przy zapisie do tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nie powiódł się zapis do tymczasowej skrzynki: %s: %s"
@@ -10471,10 +10562,18 @@ msgstr "Anulowano dołączenie listu do katalogu MH"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie można dołączyć listu do folderu mh: %s: %s"
 
+# y, c-format
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nie można utworzyć folderu \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" nie jest katalogiem."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Nie można pobrać folderu: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10496,6 +10595,30 @@ msgstr "Kolejka \"%s\" nie jest zwykłym plikiem lub katalogiem"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder \"%s/%s\" nie istnieje."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nie można otworzyć folderu \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Folder \"%s\" nie istnieje."
+
+# y, c-format
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nie można utworzyć folderu \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10738,46 +10861,46 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Nie można usunąć folderu w magazynie nowin: zamiast tego odsubskrybuj grupę."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Błąd połączenia: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Folder nie istnieje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nie można pobrać grupy: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Nie można pobrać wiadomości: nieokreślony błąd"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Nie powiodło się polecenie NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Wyszukiwanie nowych listów"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Nieznana odpowiedź serwera: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Anulowane przez użytkownika"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacja nie powiodła się: %s"
@@ -10824,7 +10947,7 @@ msgstr "Usuwanie po %s dniach"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bez obsługi jakichkolwiek rozszerzeń POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10916,7 +11039,7 @@ msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10972,7 +11095,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Wysyłanie listów za pomocą programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11142,7 +11265,7 @@ msgstr "Wysyłanie listów za pomocą SMTP poprzez %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie można wysłać listu: niepoprawny adres nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Wysyłanie listu"
 
@@ -11251,34 +11374,34 @@ msgstr "Upłynął czas oczekiwania po QUIT: %s"
 msgid "QUIT response error"
 msgstr "Błędna odpowiedź na QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "załącznik"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy załączników"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Dodaj załącznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Załącza plik do listu"
 
@@ -11393,14 +11516,14 @@ msgstr "Kliknij aby wybrać foldery do których wysłać"
 msgid "Attach file(s)"
 msgstr "Załączenie plików"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11408,7 +11531,7 @@ msgstr ""
 "Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
 "szyfrującego dla konta wysyłającego"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11417,30 +11540,30 @@ msgstr ""
 "Błąd przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisać?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Błąd przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Błąd przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Błąd przy dostępie do pliku: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nie można pobrać listu z edytora"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11449,7 +11572,7 @@ msgstr ""
 "Nie można zmienić położenia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11458,7 +11581,7 @@ msgstr ""
 "Nie można przyciąć pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11467,7 +11590,7 @@ msgstr ""
 "Nie można skopiować deskryptora: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11476,7 +11599,7 @@ msgstr ""
 "Błąd przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11484,7 +11607,7 @@ msgstr ""
 "Odnaleziono niezapisane wiadomości z poprzedniej sesji Evolution.\n"
 "Czy chcesz spróbować je odzyskać?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11495,23 +11618,23 @@ msgstr ""
 "\n"
 "Czy chcesz zapisać zmiany?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Wygenerowany automatycznie"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
@@ -11519,20 +11642,20 @@ 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:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11540,7 +11663,7 @@ msgstr ""
 "Nie można otworzyć okna tworzenia listu:\n"
 "Nie można uaktywnić formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11552,7 +11675,7 @@ msgstr ""
 "Upewnij się, że w systemie zainstalowane są\n"
 "poprawne wersje pakietów gtkhtml i  libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11560,7 +11683,7 @@ msgstr ""
 "Nie można otworzyć okna tworzenia listu:\n"
 "Nie można uaktywnić komponentu edytora HTML-a."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11915,7 +12038,7 @@ msgstr "Wtedy"
 msgid "You must specify a folder."
 msgstr "Należy podać folder."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Wybór folderu"
@@ -11930,19 +12053,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Ważne"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Do zrobienia"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Później"
 
@@ -12030,7 +12153,7 @@ msgstr ""
 "Data listu będzie porównywana z czasem\n"
 "zastosowania filtru."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
@@ -12046,7 +12169,7 @@ msgstr "temu"
 msgid "months"
 msgstr "miesięcy"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekund"
 
@@ -12215,7 +12338,7 @@ msgstr "nie jest oznaczony"
 msgid "Junk Test"
 msgstr "Test śmieci"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etykieta"
@@ -12321,9 +12444,10 @@ msgstr "rozpoczyna się od"
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Temat"
 
@@ -12331,25 +12455,25 @@ msgstr "Temat"
 msgid "Unset Status"
 msgstr "Wyczyszczenie stanu"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Nazwa reguły \"%s\" nie jest unikalna, wybierz inną."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Reguły"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Dodaj regułę"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regułę"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Nazwa reguły"
 
@@ -12389,15 +12513,15 @@ msgstr "Temat zawiera"
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Należy nadać temu vFolderowi nazwę."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Należy podać jako źródło przynajmniej jeden folder."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Źródło VFolderów"
 
@@ -12448,9 +12572,9 @@ msgstr "Przeglądarka folderu pocztowego Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Kontrola preferencji poczty Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Poczta"
 
@@ -12458,7 +12582,7 @@ msgstr "Poczta"
 msgid "Mail Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Ustawienia poczty"
 
@@ -12496,15 +12620,15 @@ msgstr "Należy podać poprawną nazwę skryptu"
 msgid "[script]"
 msgstr "[skrypt]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Język(i)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Dodanie skryptu generującego podpis"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
@@ -12589,7 +12713,6 @@ msgid "Unread messages"
 msgstr "Nieprzeczytanych wiadomości"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybrać folder> "
 
@@ -12597,294 +12720,312 @@ msgstr "<kliknij, aby wybrać folder> "
 msgid "Create New Folder"
 msgstr "Tworzenie nowego folderu"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nazwa folderu:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Na tym komputerze"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "NIEPASUJĄCE"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Nadchodzące"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Wybór folderu"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Tworzenie folderu"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nie można usunąć folderu: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Czy rzeczywiście usunąć folder \"%s\" i wszystkie jego podfoldery?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Usunięcie \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Nie można zmienić nazwy folderu %s: Folder nie istnieje"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Zmień nazwę folderu"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Folder o nazwie \"%s\" już istnieje. Użyj innej nazwy."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Otwórz w nowym _oknie"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Przenieś"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nowy folder..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listę"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Prześlij"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Po_dążaj..."
 
 # FIXME - upewnić się, że tak a nie inaczej :)
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "_Oznacz jako zakończone"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Wy_czyść flagę"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako nieważne"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Oznacz jako ś_mieci"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Cofnij usunięcie"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenieś do folderu..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawcę do _książki adresowej"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Zastosuj fi_ltry"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "_Utwórz regułę na podstawie listu"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcę"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorców"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listę dyskusyjną"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "VFolder w oparciu o _wątek"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcę"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorców"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stę dyskusyjną"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtr w oparciu o wątek"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Domyślne"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 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:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknij aby wysłać %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Dopasowania: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Niepodpisana"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Wiadomość nie jest podpisana. Nie ma gwarancji, że nadawca wiadomości jest "
 "autentyczny."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Podpis prawidłowy"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 "Wiadomość jest podpisana i poprawna, jest bardzo prawdopodbne, że jej "
 "nadawca jest tym za kogo się podaje."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Nieprawidłowy podpis"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12892,11 +13033,11 @@ msgstr ""
 "Nie można zweryfikować podpisu wiadomości, list mógł być naruszony podczas "
 "transmisji."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Poprawny podpis, nie można zweryfikować nadawcy"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12904,11 +13045,11 @@ msgstr ""
 "Wiadomość ta jest podpisana poprawnym podpisem, ale nadawca tego listu nie "
 "może być zweryfikowany."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Niezaszyfrowana"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12916,11 +13057,11 @@ msgstr ""
 "Ta wiadomość nie jest zaszyfrowana. Jej zawartość może być podglądnięta "
 "podczas transmisji przez Internet."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Zaszyfrowana, słabo"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12930,11 +13071,11 @@ msgstr ""
 "obcej będzie trudno, ale nie niemożliwie podejrzeć w konkretnym czasie "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Zaszyfrowana"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12942,11 +13083,11 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana. Osobie obcej będzie trudno podejrzeć "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Zaszyfrowana, silnie"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12955,36 +13096,36 @@ 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Wyświetl certyfikat"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Tego certyfikatu nie można wyświetlić"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ukończone %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Zaległe:"
 
 # FIXME - sprawdzić czy ma być na pawno "od"
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "od %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Wyświetlenie w treści listu"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Ukryj"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
@@ -13027,29 +13168,34 @@ msgstr "Wskaźnik na nieznane zewnętrzne dane (typu \"%s\")"
 msgid "Formatting message"
 msgstr "Formatowanie listu"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Program pocztowy"
 
@@ -13063,8 +13209,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13083,20 +13229,25 @@ msgstr ""
 "Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
 "szyfrowanych"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Nieobsługiwany format podpisu"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nieznany błąd weryfikacji podpisu"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Nieznany błąd weryfikacji podpisu"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (wbudowany)"
 
@@ -13112,56 +13263,56 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nie można zmigrować buforów UID pop3: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Nie można zmigrować stanu rozwinięcia folderu: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nie można utworzyć katalogu \"%s\": %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nie można otworzyć magazynu dla \"%s\": %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nienazwany_obra.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Ustaw jako _tło"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "Otwórz odnośnik w p_rzeglądarce"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Wyślij _list do..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "Dodaj d_o książki adresowej"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Otwórz za pomocą programu %s..."
@@ -13208,17 +13359,17 @@ msgstr "Filtry"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Przesyłany list ----------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13227,7 +13378,7 @@ msgstr ""
 "Nie można zapisać do \"%s\"\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13236,29 +13387,35 @@ msgstr ""
 "Plik o nazwie \"%s\" już istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "list"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Błąd: \"%s\" istnieje i nie jest zwykłym plikiem"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Zapis wiadomości..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Dodanie adresu"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "List od %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie można utworzyć katalogu tymczasowego: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13272,7 +13429,7 @@ msgstr ""
 "\n"
 "Czy rzeczywiście usunąć te listy?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13298,81 +13455,95 @@ msgid "Check incoming mail being junk"
 msgstr "Wyszukiwanie śmieci w nadchodzącej poczcie"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Wyszukiwanie śmieci w nadchodzącej poczcie dla kont IMAP"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Kolor podświetlenia cytatów"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Kolor podświetlenia cytatów."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Domyślny zestaw znaków tworzonych listów"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Domyślny zestaw znaków tworzonych listów."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Domyślny zestaw znaków w jakim wyświetlane są listy"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Domyślny zestaw znaków w jakim wyświetlane są listy."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Domyślny styl przesyłania"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Domyślny temat listu."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Domyślny temat listu."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Domyślny styl odpowiadania"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Domyślna szerokość paska folderów"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Domyślna szerokość paska folderów"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Zaznaczanie błędnych wyrazów podczas pisania."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Opróżnianie folderów śmietnika przy zakończeniu"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Opróżnianie wszystkich folderów śmietnika przy zakończeniu."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Włączenie trybu karetki, dzięki czemu widać kursor podczas czytania listu."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Przełącza tryb karetki"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Wysokość panelu listy wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Wysokość panelu listy wiadomości."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13382,15 +13553,15 @@ msgstr ""
 "do wyświetlenia zawartości zostanie użyty komponenet bonobo przeglądarki z "
 "bazy MIME GNOME, wskazywany przez jeden z elementów MIME na liście."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Lista etykiet i przypisanych im kolorów"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Lista kont"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13398,11 +13569,11 @@ 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 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:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13410,16 +13581,16 @@ 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:28
+#: mail/evolution-mail.schemas.in.in.h:31
 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:29
+#: mail/evolution-mail.schemas.in.in.h:32
 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:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13429,81 +13600,81 @@ 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Akcje filtra dziennika"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Akcje filtra dziennika na podanym pliku dziennika."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Plik dziennika do zapisu akcji filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Plik dziennika do zapisu akcji filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Oznaczenie jako przeczytane po określonym czasie"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Oznaczenie jako przeczytane po określonym czasie."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zaznaczanie cytatów w \"Podglądzie\" wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zaznaczanie cytatów w \"Podglądzie\" wiadomości."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 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:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Plik dźwięku powiadamiania o nowej poczcie"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Rodzaj powiadamiania o nowej poczcie"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Potwierdzenie przy pustym temacie"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 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:46
+#: mail/evolution-mail.schemas.in.in.h:49
 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:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Potwierdzenie podczas opróżniania folderu przez użytkownika"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 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:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13511,101 +13682,93 @@ 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 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:52
+#: mail/evolution-mail.schemas.in.in.h:55
 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:53
+#: mail/evolution-mail.schemas.in.in.h:56
 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:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Uruchomienie testu śmieci na nadchodzącej poczcie"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Uruchomienie testu śmieci na nadchodzącej poczcie dla kont IMAP (poprawne "
-"gdy opcja check_incoming jest ustawiona)"
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3tna 0pcja"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3tna 0pcja."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Domyślne wysłanie listu w formacie HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Domyślne wysłanie listu w formacie HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Wyświetlanie animacji"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Wyświetlanie animowanych obrazów jako animacji."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Wyświetlanie usuniętych listów (z przekreśleniem) na liście wiadomości."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Wyświetlanie usuniętych listów na liście wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Wyświetlanie panelu \"Podgląd\""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Wyświetlanie panelu \"Podgląd\"."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Odtwarzany plik dźwięku po otrzymaniu nowej poczty."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Określa rodzaj powiadamiania o nowej poczcie, jakiego chce użyć użytkownik."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Sprawdzanie pisowni"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Czcionka terminalowa"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Czcionka terminalowa do wyświetlania wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Czcionka o zmiennej szerokości do wyświetlania wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13617,99 +13780,99 @@ msgstr ""
 "następujący: &lt;header enabled&gt; - ustawione enabled (włączony) kiedy "
 "nagłówek ma być wyświetlany w widoku listu."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Grupowanie listów w wątki."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Grupowanie listów w wątki"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Grupowanie listów w wątki według tematu"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Okres czasu po jakim wiadomość będzie uznana za przeczytaną"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Okres czasu po jakim wiadomość będzie uznana za przeczytaną."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Ciąg określający UID domyślnego konta."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Użycie daemona i klienta Spamasssassin"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Użycie daemona i klienta Spamasssassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Użycie własnych czcionek"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Użycie własnych czcionek do wyświetlania listów"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Użycie tylko lokalnych testów spamu."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Użycie tylko lokalnych testów spamu (bez DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Czcionka o zmiennej szerokości"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Element menu Widok/Bcc jest zaznaczony"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Element menu Widok/Bcc jest zaznaczony."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Element menu Widok/Cc jest zaznaczony"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Element menu Widok/Cc jest zaznaczony."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Element menu Widok/Od jest zaznaczony"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Element menu Widok/Od jest zaznaczony."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Element menu Widok/Wyślij do jest zaznaczony"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Element menu Widok/Wyślij do jest zaznaczony."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Element menu Widok/Odpowiedz do jest zaznaczony"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Element menu Widok/Odpowiedz do jest zaznaczony."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13717,69 +13880,66 @@ msgstr ""
 "Określa, czy powrócić do wątkowania według tematu, jeżeli wiadomość nie "
 "zawiera nagłówków In-Reply-To lub Reference."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "portu uruchamianego przez użytkownika spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "port spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Importer Elm Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importer mbox Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Druid importu poczty Pine dla Evolution"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje starą pocztę Elma"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importowanie..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Poczekaj chwilę"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importowanie %s jako %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Analizowanie %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importowanie plików"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13787,16 +13947,44 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Elm.\n"
 "Czy chcesz zaimportować je do Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Cel jest tylko do odczytu"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Wybór importowanego certyfikatu..."
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importowanie"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importowanie plików"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Analizowanie %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtr priorytetu \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13822,7 +14010,7 @@ msgstr ""
 "punktacji zamiast priorytetów. Sprawdź zaimportowane\n"
 "filtry, aby upewnić się, że wszystko działa jak powinno."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13834,7 +14022,7 @@ msgstr ""
 "Nie jest ona obsługiwana przez Evolution, więc\n"
 "zawierające ją filtry zostaną porzucone."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13848,31 +14036,24 @@ 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:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Skanowanie filtrów poczty"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Analizowanie katalogu"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Uruchamianie importu"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importuje stare dane Netscape'a"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Filtry poczty"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13880,11 +14061,20 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Netscape.\n"
 "Czy chcesz zaimportować je do Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje stare dane Pine'a"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importowanie plików"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Książka adresowa"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13892,7 +14082,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Pine.\n"
 "Czy chcesz zaimportować je do Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13936,19 +14126,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Nie zostały podane wszystkie wymagane informacje."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Nazwa _użytkownika:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Ś_cieżka:"
 
@@ -14000,27 +14190,42 @@ msgstr ""
 "   \"%s\"\n"
 "I zostały zaktualizowane."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_List"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Tworzy nowy list"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nowy VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtry poczty"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Tworzy nowy kalendarz"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "Adres URI źródła listu wyświetlanego przez widok"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Tożsamość"
 
@@ -14064,7 +14269,7 @@ msgstr ""
 "pewności co do tych informacji, zapytaj administratora lub dostawcę "
 "Internetu (ISP)."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Zarządzanie kontami"
 
@@ -14091,118 +14296,114 @@ msgid "Connecting to server..."
 msgstr "Nawiązywanie połączenia z serwerem..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Sprawdź obsługiwane typy "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Ta kopia Evolution nie obsługuje protokołu SSL)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obsługuje protokołu SSL)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>Wyświetlane _nagłówki listów</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Przy wysyłaniu zaszyfrowanych listów s_zyfrowanie także do siebie"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Edytor kont"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Dodaj sk_rypt"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Dodaj nowy podpis"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysyłaniu zaszyfrowanych listów _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Wysyłanie niewidocznych kopii wszystkich listów (_Bcc) do:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Wysyłanie kopii wszystkich listów (_Cc) do:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Przy szyfrowaniu ufanie kluczom we własnej bazie kluczy"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Załączenie oryginalnego listu"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Załącznik"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bałtycki (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bałtycki (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Zestaw znaków:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "K_olory"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Sprawdzan_ie nowej poczty"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Sp_rawdzanie pisowni podczas pisania"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Wyszukuje śmieci w nadchodzącej poczcie"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Kolor _błędnie napisanych słów:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Tworzenie listów"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14218,279 +14419,275 @@ msgstr ""
 "\n"
 "Kliknij \"Zastosuj\", aby zapisać ustawienia."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "D_omyślne"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Domyślne zachowanie"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Domyślny _zestaw znaków:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Usuwanie poczty"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Podpisyw_anie cyfrowe wszystkich wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "Bez sprawdza_nia poczty przychodzącej dla kont IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Bez cytowania oryginalnego listu"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Bez podpisywania próśb o _spotkanie (dla zgodności z programem Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Opróżnianie folderów śmietnika przy zakończeniu"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "C_ertyfikat szyfrujący:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Wykonanie polecenia..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Stała szerokość:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Opcje filtrów"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Ustawienia czcionek"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Zapis listów w formacie _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Nagłó_wki"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Wyróżnianie cytatów za pomocą koloru"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "W treści listu"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etykiety i kolory"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Pobieranie obrazów"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Położenie skrzynki"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Edytor listów"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Wyświetlanie listu"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Czcionki wiadomości"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Powiadamianie o nowej poczcie"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Uwaga: zapytanie o hasło pojawi się dopiero przy pierwszej próbie połączenia"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Wybór koloru"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Potwierdzanie przy wysyłaniu listu tylko z _ukrytymi adresatami (Bcc)"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Drukowane czcionki"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Cytowanie oryginalnego listu"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Zapamiętanie hasła"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "O_dpowiedź do:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Opcje _odbioru"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Zapamiętanie tego _hasła"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Przywróć domyślne"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "B_ezpieczeństwo"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpieczne MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Wybór czcionki o stałej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Wybór czcionki o stałej szerokości używanej na wydruku"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Wybór czcionki o zmiennej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Wybór czcionki o zmiennej szerokości używanej na wydruku"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Wysyłanie listów"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Folder z _wysłanymi listami:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Listy wysłane i szkice"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Certyfikat szyfr_ujący:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Nazwa p_liku:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Sprawdzanie p_isowni"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14500,7 +14697,7 @@ msgstr ""
 "podpis. Wpisana nazwa będzie używana tylko przy\n"
 "wyświetlaniu."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14510,7 +14707,7 @@ msgstr ""
 "język. Lista dostępnych języków odnosi się tylko do języków, dla których "
 "zostały zainstalowane słowniki."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14518,15 +14715,15 @@ msgstr ""
 "Wpisz nazwę, przy użyciu której chcesz się odnosić do tego konta.\n"
 "Na przykład: \"Służbowe\" lub \"Prywatne\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "_Daemon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Zmienna szerokość:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14536,173 +14733,173 @@ msgstr ""
 "\n"
 "Aby rozpocząć, kliknij \"Naprzód\"."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Dodaj podpis"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Pobieranie obrazów z sieci w _każdym przypadku"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "P_odpisywanie wszystkich listów wychodzących przy użyciu tego konta"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automatyczne sprawdzanie nowych listów co"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatyczne wstawianie obrazów z buźkami"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Brzęczyk po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "P_otwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Domyślny podpis:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Domyślne"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bez powiadamiania o nadejściu nowej poczty"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Uaktywnij"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Szyfrowanie wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Sposób p_rzesyłania:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Pełna nazwa:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Listy w _HTML-u"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Tożsamość"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "Ś_mieć"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Pobieranie obrazów, jeśli nadawca jest w książce adresowej"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Tylko _lokalny test"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domyślne"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie listów jako \"przeczytane\" po upływie"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obrazów z sieci"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Odtwarzanie dźwięku po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Potwierdzanie przy wysyłaniu listów w formacie HTML do osób, które ich nie "
 "chcą"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysyłaniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "O_dbieranie poczty"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Sposób odpo_wiadania:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Przywróć domyślne"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skrypt:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Wybierz..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Wy_syłanie listów"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Wyświetlanie _animowanych obrazów"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Zwykła czcionka:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Czcionka terminala:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego połączenia (_SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Używanie tych samych czcionek co inne aplikacje"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Odpytywanie %s"
@@ -14725,7 +14922,7 @@ msgstr ""
 "Błąd przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Wykonywanie operacji"
 
@@ -14737,13 +14934,13 @@ msgstr "Filtrowanie folderu"
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14752,116 +14949,116 @@ msgstr ""
 "Nie powiodło się dodanie do %s: %s\n"
 "Zamiast tego będzie dodanie do folderu \"Wysłane\"."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysyłanie \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysyłanie %d. listu z %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. liście z %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie listów do %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie listów do %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folderów w \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Przesłane listy"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Odświeżanie folderu"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Opróżnianie śmietnika w \"%s\""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d listów"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d listów"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14870,7 +15067,7 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14879,11 +15076,11 @@ msgstr ""
 "Błąd przy zapisie listów do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Zapisywanie załącznika"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14892,22 +15089,22 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie można zapisać danych: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odłączanie od %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawiązywanie połączenia z %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Zmienianie statusu śmieci"
 
@@ -14939,38 +15136,38 @@ msgstr "Szyfrowanie"
 msgid "Security Information"
 msgstr "Informacje o zabezpieczeniach"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Serwer: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Ścieżka: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Wysyłanie i odbiór poczty"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Anuluj _wszystko"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
@@ -15079,20 +15276,20 @@ msgstr ""
 "   \"%s\"\n"
 "I zostały zaktualizowane."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Próba zmodyfikowania vfoldera \"%s\", który nie istnieje"
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
@@ -15415,97 +15612,20 @@ msgstr "Foldery trybu bez podłączenia"
 msgid "Autocompletion Folders"
 msgstr "Foldery do uzupełniania"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Nie można skopiować folderu: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Nie można przenieść folderu: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Nie można przenieść folderu do niego samego."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Nie można skopiować folderu do niego samego."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Nie można skopiować folderu do jego folderu podrzędnego."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Wybierz folder, do którego chcesz skopiować \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Skopiuj folder"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Wybierz folder, do którego chcesz przenieść \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Przenieś folder"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Nie można usunąć folderu:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Czy rzeczywiście usunąć folder \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Nie można zmienić nazwy folderu:\n"
+"Nie można utworzyć podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Podana nazwa folderu nie jest poprawna: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Wybrany folder nie należy do innego użytkownika"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nie można usunąć folderu:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Nie można utworzyć podanego folderu:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
@@ -15646,7 +15766,7 @@ msgstr "Nie można uruchomić gpg."
 msgid "_Import"
 msgstr "Za_importuj"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Zamykanie połączeń..."
 
@@ -15684,6 +15804,10 @@ msgstr "Nie można otworzyć współdzielonego folderu: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nie można odnaleźć podanego współdzielonego folderu."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Uruchamianie importu"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15800,123 +15924,6 @@ msgstr "Nie odnaleziono bazy danych konfiguracji"
 msgid "Generic error"
 msgstr "Błąd ogólny"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Utwórz nową grupę skrótów"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nazwa grupy:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Czy na pewno chcesz usunąć z paska skrótów grupę \"%s\"?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Zmiana nazwy grupy skrótów"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Zmień nazwę wybranej grupy skrótów na:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Małe ikony"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Wyświetla skróty jako małe ikony"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Duże ikony"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Wyświetla skróty jako duże ikony"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Dodaj grupę..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Tworzy nową grupę skrótów"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Usuń grupę..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Usuwa tę grupę skrótów"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Zmień nazwę grupy..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Zmienia nazwę grupy skrótów"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Ukryj pasek skrótów"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Ukrywa pasek skrótów"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Utwórz _domyślne skróty"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Tworzy domyślne skróty"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Zmień nazwę skrótu"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Zmień nazwę wybranego skrótu na:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Otwiera folder powiązany ze skrótem"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Otwórz w nowym _oknie"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Otwiera w nowym oknie folder powiązany ze skrótem"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Zmienia nazwę skrótu"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Usuń"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Usuwa skrót z paska skrótów"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Błąd przy zapisywaniu skrótów."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Skróty klawiszowe"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Pole wyboru"
@@ -15927,11 +15934,6 @@ msgstr "Pole wyboru"
 msgid "New"
 msgstr "Nowy"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" w \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16233,46 +16235,46 @@ msgstr ""
 "%s: Nie można jednocześnie użyć opcji --online i --offline.\n"
 "  Aby uzyskać więcej informacji, uruchom %s --help.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Wybór importowanego certyfikatu..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Nazwa certyfikatu"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Zastosowania"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Numer seryjny"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Traci ważność"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Przeglądarka certyfikatu: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Wprowadź hasło dla \"%s\""
 
 # FIXME - może zamiast temat dać przedmiot?
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16281,7 +16283,7 @@ msgstr ""
 "Wydany dla:\n"
 "  Temat: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16348,7 +16350,7 @@ msgstr ""
 "zapoznać się z jego certyfikatem oraz procedurami bezpieczeństwa (o ile są "
 "dostępne)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Certyfikat"
 
@@ -16413,11 +16415,11 @@ msgstr "Jednostka organizacyjna (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Odcisk SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "Certyfikat klienta SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "Certyfikat serwera SSL"
 
@@ -16467,219 +16469,219 @@ msgstr "W ewidencji dostępne są certyfikaty identyfikujące następujące osob
 msgid "Your Certificates"
 msgstr "Dostępne certyfikaty"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Certyfikat już istnieje"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Wersja"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Wersja 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Wersja 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Wersja 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 MD2 z RSA"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 MD5 z RSA"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 SHA-1 z RSA"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 RSA"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Użycie klucza certyfikatu"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Rodzaj certyfikatu Natscape"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Identyfikator klucza ośrodka certyfikacji"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identyfikator algorytmu (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Identyfikator algorytmu"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Parametry algorytmu"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Informacja klucza publicznego tematu"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Algorytm klucza publicznego tematu"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Klucz publiczny tematu"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Błąd: Nie można przetworzyć rozszerzenia"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Podpisujący obiekt"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "Ośrodek certyfikacji SSL"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Ośrodek certyfikacji e-mail"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Podpisywanie"
 
 # FIXME - albo nieodrzucanlne
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "Nie odrzucone"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Szyfrowanie klucza"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Szyfrowanie danych"
 
 # FIXME - albo kluczowe uzgodnienie? 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Uzgodnienie kluczy"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Podpisujący certyfikat"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "Podpisujący CRL"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Krytyczne"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Nie krytyczne"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Błędny podpis certyfikatu"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Wystawiający"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "Unikalne ID wystawiającego"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "Unikalne ID tematu"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Wartość podpis certyfikatu"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Hasło pliku PKCS12"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Wprowadź hasło dla pliku PKCS12:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Zaimportowany certyfikat"
 
@@ -17270,7 +17272,8 @@ msgid "_Threaded Message List"
 msgstr "Grupowanie listów w wąt_ki"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _nadawcę do książki adresowej"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17278,7 +17281,8 @@ msgid "A_pply Filters"
 msgstr "_Zastosuj filtry"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Dodaj nadawcę do książki adresowej"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17726,10 +17730,6 @@ msgstr "_Format"
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Otwórz"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Otwiera plik"
@@ -18091,22 +18091,6 @@ msgstr "Wyślij / _Odbierz"
 msgid "_Window"
 msgstr "O_kno"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Wydrukowanie zestawienia"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Wydruk zestawienia"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Odśwież"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Odświeża widok"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Według _firmy"
@@ -18167,8 +18151,8 @@ msgstr "Z _kategorią"
 msgid "_Tasks"
 msgstr "_Zadania"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18412,23 +18396,23 @@ msgstr "_Znajdź"
 msgid "_Find Now"
 msgstr "_Znajdź teraz"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "Wy_czyść"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID pozycji"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID podpozycji"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Znajdź _teraz"
 
@@ -18442,6 +18426,220 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Źródła książki adresowej"
+
+#~ msgid "No data provided"
+#~ msgstr "Nie podano danych"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można otworzyć pliku \"%s\":\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można utworzyć katalogu \"%s\":\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można utworzyć pliku \"%s\":\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "\"%s\" nie jest katalogiem."
+
+#~ msgid "On this Computer"
+#~ msgstr "Na tym komputerze"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Wyszukiwanie śmieci w nadchodzącej poczcie dla kont IMAP"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Uruchomienie testu śmieci na nadchodzącej poczcie dla kont IMAP (poprawne "
+#~ "gdy opcja check_incoming jest ustawiona)"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importowanie %s jako %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Skanowanie filtrów poczty"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Analizowanie katalogu"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "Bez sprawdza_nia poczty przychodzącej dla kont IMAP"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Nie można skopiować folderu: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Nie można przenieść folderu: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Nie można przenieść folderu do niego samego."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Nie można skopiować folderu do niego samego."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Nie można skopiować folderu do jego folderu podrzędnego."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Wybierz folder, do którego chcesz skopiować \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Skopiuj folder"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Wybierz folder, do którego chcesz przenieść \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Przenieś folder"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można usunąć folderu:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Czy rzeczywiście usunąć folder \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można zmienić nazwy folderu:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Wybrany folder nie należy do innego użytkownika"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można usunąć folderu:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Utwórz nową grupę skrótów"
+
+#~ msgid "Group name:"
+#~ msgstr "Nazwa grupy:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Czy na pewno chcesz usunąć z paska skrótów grupę \"%s\"?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Zmiana nazwy grupy skrótów"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Zmień nazwę wybranej grupy skrótów na:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Małe ikony"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Wyświetla skróty jako małe ikony"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Duże ikony"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Wyświetla skróty jako duże ikony"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Dodaj grupę..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Tworzy nową grupę skrótów"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Usuń grupę..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Usuwa tę grupę skrótów"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Zmień nazwę grupy..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Zmienia nazwę grupy skrótów"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Ukryj pasek skrótów"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Ukrywa pasek skrótów"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Utwórz _domyślne skróty"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Tworzy domyślne skróty"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Zmień nazwę skrótu"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Zmień nazwę wybranego skrótu na:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Otwiera folder powiązany ze skrótem"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Otwórz w nowym _oknie"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Otwiera w nowym oknie folder powiązany ze skrótem"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Zmienia nazwę skrótu"
+
+#~ msgid "Re_move"
+#~ msgstr "_Usuń"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Usuwa skrót z paska skrótów"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Błąd przy zapisywaniu skrótów."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Skróty klawiszowe"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" w \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Wydrukowanie zestawienia"
+
+#~ msgid "Print summary"
+#~ msgstr "Wydruk zestawienia"
+
+#~ msgid "Reload"
+#~ msgstr "Odśwież"
+
+#~ msgid "Reload the view"
+#~ msgstr "Odświeża widok"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Skopiuj do folderu..."
 
diff --git a/po/pt.po b/po/pt.po
index 3410c25cba..4efdb0b55a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.4\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2003-05-22 01:35+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -51,8 +51,7 @@ msgstr "Configure aqui as suas contas de correio"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -93,20 +92,20 @@ msgstr "Controlo de definições de configuração de pasta Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Livro Endereços"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -114,67 +113,67 @@ msgstr "Livro Endereços"
 msgid "Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Novo Contacto:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Criar um novo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nova Lista Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Nova Lista Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Incapaz de se ligação ao servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falha ao autenticar-se no servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Incapaz de efectuar pesquisa no DSE Raíz"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Erro ao obter informação de esquema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Servidor não respondeu com informação de esquema válida"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "A Aguardar..."
@@ -188,42 +187,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "A Pingar %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Pastas de Completar Automaticamente"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -235,7 +236,7 @@ msgstr ""
 "forma mais específica ou eleve o limite de resultados nas preferências\n"
 "do servidor de directório para este livro de endereços."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -247,21 +248,21 @@ msgstr ""
 "forma mais específica ou eleve o limite de tempo nas preferências do\n"
 "servidor de directório para este livro de endereços."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O backend para este livro de endereços foi incapaz de parsear a procura."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O backend para este livro de endereços recusou-se a efectuar esta procura."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Esta procura não terminou com sucesso."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -270,7 +271,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços. Verifique que o caminho\n"
 "existe e de que tem permissões para lhe aceder."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -280,7 +281,7 @@ msgstr ""
 "ou introduziu um URI incorrecto ou o servir LDAP não está\n"
 "acessível."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -292,7 +293,7 @@ msgstr ""
 "compilar a aplicação a partir do código fonte em CVS após\n"
 "obter o OpenLDAP do link abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -302,28 +303,33 @@ msgstr ""
 "que introduziu um URI incorrecto, ou que o servidor está\n"
 "inacessível."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Incapaz de abrir ivro de endereços"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar-se.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduza senha para %s (utilizador %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "O URI que o calendário irá mostrar"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "O URI que o calendário irá mostrar"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -367,7 +373,7 @@ msgstr "  Mostrar _Bases Suportadas "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -400,20 +406,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Assistente Configuração LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Origens Livros Endereços"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Origens Livros Endereços"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Fontes Livros Endereços..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Sempre"
 
@@ -424,7 +431,8 @@ msgstr "Anonimamente"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -433,52 +441,52 @@ msgstr ""
 "\n"
 "Prima o botão \"Terminar\" para gravar as configurações que aqui introduziu."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "A ligar"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Nome distinto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Endereço email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution irá utilizar este DN para o autenticar no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution irá utilizar este endereço email para o autenticar no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Terminado"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Grupo"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -494,23 +502,23 @@ msgstr ""
 "a sua ligação. Pergunte ao seu administrador de sistemas se o seu servidor "
 "LDAP utiliza estes protocolos."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Um"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Â_mbito procura: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "A Procurar"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Seleccionado:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -520,7 +528,7 @@ msgstr ""
 "servidor\n"
 "LDAP se este suportar SSL ou TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -538,7 +546,7 @@ msgstr ""
 "a sua ligação\n"
 "já é segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -552,7 +560,7 @@ msgstr ""
 "explorações\n"
 "de segurança. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -563,44 +571,45 @@ msgstr ""
 "Evolution\n"
 "para procuras LDAP e para criar e editar contactos. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Especificar um nome de apresentação é o último passo requerido para "
 "configurar ums ervidor LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Passo 1: Informação Servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Passo 2: A Ligar-se ao Servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Passo 3: A Procurar no Directório"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Bases Procura Suportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -614,7 +623,7 @@ msgstr ""
 "sistemas\n"
 "caso necessite de alterar estas opções."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -625,7 +634,7 @@ msgstr ""
 "irão começar.\n"
 "Se deixar vazio, as procuras iniciar-se-ão na raiz da árvore de directório."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -640,12 +649,13 @@ msgstr ""
 "da sua base de procura. Um âmbito de procura de \"um\" apenas incluirá "
 "entradas um nível abaixo da sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -656,7 +666,7 @@ msgstr ""
 "sobre o servidor. Contacte o seu administrador de sistemas se necessitar\n"
 "de ajuda a descobrir esta informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -664,17 +674,18 @@ msgstr ""
 "Este é o nome completo do seu servidor ldap. Por exemplo, \"ldap."
 "minhaempresa.pt\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Este é o número máximo de entradas a descarregar. Configurar este número "
 "para\n"
 "ser demasiado grande irá tornar mais lento o seu livro de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -684,7 +695,7 @@ msgstr ""
 "configurar isto para \"Endereço Email\" requer acesso anónimo ao seu "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -694,7 +705,7 @@ msgstr ""
 "Evolution.\n"
 "É apenas para fins visuais."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -705,7 +716,7 @@ msgstr ""
 "Evolution.\n"
 "É apenas para fins visuais."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -718,28 +729,28 @@ msgstr ""
 "sistemas\n"
 "que porto deverá especificar."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Esta opção determina quanto poderá durar uma procura."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Utilizar _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Utilizar nome distinto (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "utilizar endereço email"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Sempre Que Possível"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -752,19 +763,19 @@ msgstr ""
 "informação de autenticação. Pergunte ao seu administrador de sistemas caso "
 "desconheça a informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Nome apresentação:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Limite _descarregar:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -773,39 +784,39 @@ msgstr "Limite _descarregar:"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Método autenticação:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "Número _porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "Ba_se procura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Nome _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "E_xpiração (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "aba-a-ligar-se"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "aba-geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "aba-procura"
 
@@ -928,7 +939,7 @@ msgstr "Colaboração"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor Contactos"
 
@@ -1025,10 +1036,10 @@ msgstr "_Categorias..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1076,15 +1087,15 @@ msgid "_Web page address:"
 msgstr "Endereço página _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2076,109 +2087,117 @@ msgid "AOL Instant Messenger"
 msgstr "_Afixar Mensagem"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Lista Sem Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Mensagem Correio"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Serviço iniciado"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Localização:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Nome utilizador:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Casa"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Trabalho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nome Conta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Editor categorias indisponível."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Gravar Contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2186,7 +2205,7 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar estes contactos?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2194,47 +2213,52 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar este contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Profissional"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Incapaz de encontra widget para um campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Adição-Rápida Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Edição Completa"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Nome Comp_leto:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E_mail:"
 
@@ -2394,11 +2418,11 @@ msgid "Is New List"
 msgstr "É Nova Lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor Lista Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Gravar Lista como VCard"
 
@@ -2489,13 +2513,13 @@ msgid "Email begins with"
 msgstr "Email começa por"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
@@ -2512,101 +2536,101 @@ msgid "Type"
 msgstr "Tipo"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Livro Endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gravar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Novo Contacto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nova Lista Contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Ir para Pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Procurar Contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Fontes Livros Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Configuração Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Enviar Mensagem para Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Imprimir Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Livro Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Livro Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Vista Actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2618,8 +2642,8 @@ msgstr ""
 "crashou. Terá de reiniciar o Evolution para o poder utilizar novamente"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
@@ -2662,7 +2686,7 @@ msgid "Company Phone"
 msgstr "Telefone Empresa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2724,7 +2748,7 @@ msgid "Nickname"
 msgstr "Alcunha"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Nota"
 
@@ -2733,7 +2757,7 @@ msgid "Office"
 msgstr "Escritório"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organização"
 
@@ -2861,69 +2885,75 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tem Cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Trabalho"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Pessoal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bolonha"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Título car_go:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax Pessoal"
@@ -2933,8 +2963,8 @@ msgid "Success"
 msgstr "Sucesso"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2966,7 +2996,7 @@ msgstr "Protocolo não suportado"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2986,7 +3016,8 @@ msgid "TLS not Available"
 msgstr "TLS Indisponível"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Livro de endereços não existe"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3128,7 +3159,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Adicionar endereço a contacto já existente \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "A Procurar no Livro Endereços..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3186,18 +3218,38 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Importador LDIF Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Formato Intercâmbio Dados LDAP (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Importador VCard Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Importador VCard Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Imprimir contactos seleccionados"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Imprimir contactos seleccionados"
@@ -3290,7 +3342,7 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "Número de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opções"
 
@@ -3473,8 +3525,8 @@ msgstr "Nenhum nome de ficheiro indicado."
 msgid "Unnamed List"
 msgstr "Lista Sem Nome"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Introduza Senha"
@@ -3555,10 +3607,9 @@ msgid "Evolution's Tasks component"
 msgstr "Componente Teste Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -3602,26 +3653,24 @@ msgstr "Tempo adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Abrir"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Nenhuma descrição disponível."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3630,12 +3679,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Aviso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3647,7 +3696,7 @@ msgstr ""
 "configurado para enviar um email. Em vez disso o Evolution\n"
 "irá mostrar um diálogo de lembrete normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3664,19 +3713,19 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicação?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Não perguntar novamente sobre esta aplicação."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Incapaz de inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Incapaz de inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Incapaz de criar a fábrica de serviço de alarme de notificação"
 
@@ -3821,24 +3870,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Mostrar _números das semanas no navegador de datas"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Descrição contém"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Sem equivalência"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Calendário"
 
@@ -3871,7 +3926,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3893,77 +3948,77 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledónia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "R_eunião"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Criar uma nova convocatória de reunião"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Novo Compromisso de Dia Completo"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Compromisso _Dia Completo"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledónia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "C_alendário:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Criar uma nova pasta"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4098,7 +4153,7 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4171,7 +4226,7 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4182,7 +4237,7 @@ msgstr "início do compromisso"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Activo"
 
@@ -4234,7 +4289,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alertas"
 
@@ -4259,7 +4314,7 @@ msgid "Days"
 msgstr "Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Activar"
 
@@ -4402,7 +4457,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Geral"
 
@@ -4504,7 +4559,7 @@ msgstr ""
 "Prima o botão \"Terminar\" para gravar as configurações que aqui introduziu."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista Tarefas"
@@ -4681,23 +4736,23 @@ msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro validação: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " para "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Terminada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Prazo "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Prazo "
 
@@ -4733,8 +4788,8 @@ msgstr "Entrada diário - %s"
 msgid "No summary"
 msgstr "Nenhum resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Gravar como..."
 
@@ -4764,11 +4819,21 @@ msgstr "Cancelar Operação"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Seleccione uma pasta de destino para importar estes dados"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Calendário"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Lista Tarefas"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4875,7 +4940,7 @@ msgstr "Delegar Para:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Compromisso"
 
@@ -4899,23 +4964,31 @@ msgstr "Calendarizar"
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Hora de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Permissão negada ao abrir o calendário"
@@ -4996,29 +5069,29 @@ msgstr "Hora _início:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nenhuma"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado já não possui nenhuma conta."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegar Para..."
 
@@ -5214,7 +5287,7 @@ msgstr "no"
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Hora:"
@@ -5251,7 +5324,7 @@ msgid "_No recurrence"
 msgstr "Sem recorrê_ncia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -5293,7 +5366,7 @@ msgstr ""
 "\n"
 "Deseja gravar as alterações?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Descartar Alterações"
 
@@ -5317,7 +5390,7 @@ msgstr "A informação de atribuição de tarefa foi criada. Envia-la?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "A informação de tarefa foi alterada. Enviar uma versão actualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Data de terminada está errada"
 
@@ -5330,7 +5403,7 @@ msgstr "% Terminada"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Terminado"
 
@@ -5343,7 +5416,7 @@ msgstr "Alta"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Em Curso"
 
@@ -5362,7 +5435,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Por Iniciar"
 
@@ -5404,16 +5477,16 @@ msgstr "Básico"
 msgid "Assignment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Data final prazo está errada"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Incapaz de abrir ivro de endereços"
@@ -5424,7 +5497,7 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -5618,11 +5691,10 @@ msgstr "Data Início"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "cor"
 
@@ -5648,7 +5720,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5683,10 +5755,10 @@ msgstr "Não"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconhecida"
@@ -5699,99 +5771,105 @@ msgstr "Recorrente"
 msgid "Assigned"
 msgstr "Atribuida"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "A apagar objectos seleccionados"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "A actualizar objectos"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Novo _Evento Dia Completo"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ir para _Hoje"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Ir para Data..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informação Livre/Ocupado"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Abrir"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Gravar Como..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendário"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas Ocorrências"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Configuraçõe_s..."
 
@@ -5879,7 +5957,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Terminada"
 
@@ -5937,26 +6015,26 @@ msgstr "%02i divisões minutos"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6139,7 +6217,7 @@ msgid "Send Latest Information"
 msgstr "Enviar Última Informação"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6600,12 +6678,12 @@ msgstr "_Prioridade:"
 msgid "Web Page:"
 msgstr "Página"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Clicar para adicionar uma tarefa"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6615,7 +6693,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6623,12 +6701,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "A abrir tarefas em %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6637,29 +6715,39 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "A Ler Imagens"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "A terminar tarefas..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "A apagar objectos seleccionados..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "A Expurgar"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "A Ler Imagens"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Nenhum compromisso."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir em %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6779,16 +6867,16 @@ msgstr "Informação livre/ocupado (%s para %s)"
 msgid "iCalendar information"
 msgstr "Informação icalendário"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Introduza Senha para %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6796,7 +6884,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6804,12 +6892,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6998,49 +7086,49 @@ msgstr "Mês seleccionado (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Tarefa"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem Terminado: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Antever Impressão"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Imprimir Item"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Configurar Impressão"
 
@@ -7049,39 +7137,39 @@ msgstr "Configurar Impressão"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Lista Tarefas"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Lista Tarefas"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7138,20 +7226,20 @@ msgstr "Ficheiros iCalendário (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendário (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Pasta pública que contém compromissos e eventos"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Eventos Calendário"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7159,7 +7247,7 @@ msgstr ""
 "Evolution encontrou ficheiro do Calendário Gnome.\n"
 "Deseja importa-los para o Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Calendário Gnome"
 
@@ -8821,7 +8909,7 @@ msgstr "Incapaz de abrir mensagem"
 msgid "Failed on message %d"
 msgstr "Falha na mensagem %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "A sincronizar pasta"
 
@@ -8907,7 +8995,7 @@ msgstr "A copiar mensagens"
 msgid "Filtering new message(s)"
 msgstr "A onter %d mensagem(ns)"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8918,15 +9006,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Falha ao parsear dica id utilizador gpg."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falha ao parsear pedido frase-senha gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8935,31 +9023,27 @@ msgstr ""
 "Necessita de uma frase-senha para destrancar a chave\n"
 "para o utilizador: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falha ao destrancar chave secreta: indicadas 3 frases-senha incorrectas."
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta de GnuPG inesperada: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nenhuns dados indicados"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falha ao encriptar: Nenhum recipiente válido especificado."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8970,34 +9054,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falha ao executar gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Falha ao executar gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9006,29 +9090,29 @@ msgstr ""
 "Incapaz de verificar assinatura da mensagem: incapaz de criar ficheiro "
 "temporário: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Incapaz de verificar assinatura da mensagem: incapaz de criar ficheiro "
 "temporário: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Conteudo índice corpos"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Incapaz de recuperar mensagem do editor"
@@ -9140,21 +9224,34 @@ msgstr "Falha ao desencriptar parte MIME: estrutura inválida"
 msgid "parse error"
 msgstr "erro parseamento"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Fornecedor de pasta virtual de email"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Para ler correio como uma consulta de outro conjunto de pastas"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Incapaz de ler %s: Leitura de módulos não suportada neste sistema."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Incapaz de ler %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Incapaz de ler %s: Nenhum código de inicialização no módulo."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Nenhum fornecedor disponível para o protocolo `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anónimo"
@@ -9314,7 +9411,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9449,20 +9546,7 @@ msgstr "Falha ao procurar servidor: servidor não encontrado"
 msgid "Host lookup failed: unknown reason"
 msgstr "Falha ao procurar servidor: razão desconhecida"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Fornecedor de pasta virtual de email"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para ler correio como uma consulta de outro conjunto de pastas"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Nenhum fornecedor disponível para o protocolo `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9532,21 +9616,25 @@ msgstr "Servidor: %s, Tipo: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Incapaz de obter pasta: Operação inválida neste armazenamento"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Incapaz de obter pasta: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Incapaz de criar pasta: Operação inválida neste armazenamento"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Incapaz de apagar pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9779,21 +9867,31 @@ msgstr "Nenhuma mensagem %s em %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Incapaz de copiar ou mover mensagens para uma Pasta Virtual"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Incapaz de apagar pasta: %s: Pasta não existe"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Incapaz de renomear pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Incapaz de renomear pasta: %s: Pasta não existe"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Incapaz de fechar pasta temporária: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Incapaz de fechar pasta temporária: %s"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9810,16 +9908,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Aplicar filtros às novas mensagens na CAIXA ENTRADA neste servidor"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Verificar novo correio _automaticamente a cada"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Livro Endereços"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9839,44 +9932,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Senha"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opção irá ligar a um servidor IMAP utilizando uma senha em texto "
 "simples."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Por Omissão"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Névoa espessa"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servidor desligou-se inesperadamente: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9885,26 +9976,26 @@ msgstr ""
 "Alerta de servidor IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada de servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falha no comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Resposta de servidor terminou demasiado cedo."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Resposta de servidor IMAP não contém informação %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada de servidor IMAP: %s"
@@ -9919,7 +10010,7 @@ msgstr "Incapaz de criar directório %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Incapaz de ler resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Pasta foi destruida e recriada no servidor."
 
@@ -9928,12 +10019,12 @@ msgstr "Pasta foi destruida e recriada no servidor."
 msgid "Scanning for changed messages"
 msgstr "A procurar mensagens alteradas"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Incapaz de obter mensagem: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9949,25 +10040,25 @@ msgstr ""
 "Incapaz de obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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 "Mensagem inexistente"
 
-#: camel/providers/imap/camel-imap-folder.c:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Esta mensagem de momento não está disponível"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "A obter informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Incapaz de encontrar corpo de mensagem na resposta FETCH."
 
@@ -10025,27 +10116,37 @@ msgstr "Nome-espaço"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros às novas mensagens na CAIXA ENTRADA neste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "A verificar novas mensagens em todas as pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "A verificar novas mensagens em todas as pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Serviço IMAP para %s em %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10054,65 +10155,65 @@ msgstr "Serviço IMAP para %s em %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Incapaz de se ligar a %s (porto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 #, fuzzy
 msgid "SSL unavailable"
 msgstr "TLS Indisponível"
 
-#: camel/providers/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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 "Ligação cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Incapaz de se ligar a servidor IMAP %s em modo seguro: %s"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Incapaz de se ligar a %s (porto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Servidor IMAP %s não suporta tipo de autenticação %s pedido"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para tipo de autenticação %s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Não introduziu a senha."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10123,24 +10224,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Pasta %s inexistente"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Incapaz de obter pasta: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "O nome de pasta \"%s\" é inválido pois contém o caracter \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não tem permissões para conter subpastas"
 
@@ -10162,7 +10271,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Incapaz de se ligar a servidor POP %s"
@@ -10246,8 +10355,8 @@ msgstr ""
 "Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10259,55 +10368,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Incapaz de obter pasta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correio %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Incapaz de renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Incapaz de renomear '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Incapaz de apagar ficheiro de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Incapaz de apagar ficheiro de índice de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Incapaz de apagar ficheiro de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Incapaz de gravar resumo: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de adicionar mensagem ao resumo: razão desconhecida"
 
@@ -10325,53 +10434,44 @@ msgstr "Incapaz de adicionar mensagem à pasta maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Conteudo de mensagem inválido"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Incapaz de abrir pasta `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Incapaz de obter pasta: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Pasta `%s' não existe."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Incapaz de criar pasta `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Incapaz de obter pasta: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' não é um directório maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Incapaz de apagar pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "não é um directório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10393,9 +10493,9 @@ msgid "Checking for new messages"
 msgstr "A verificar por novas mensagens"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "A armazenar pasta"
@@ -10439,159 +10539,137 @@ msgstr "A pasta parece estar irreversivelmente corrompida."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha na construção de mensagem: Caixa de correio corrompida?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Incapaz de abrir ficheiro `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Impossível criar uma pasta com esse nome"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Incapaz de criar directório %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Incapaz de anexar ficheiro %s: não é um ficheiro normal"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Incapaz de criar ficheiro `%s':\n"
+"Incapaz de apagar pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' não é um ficheiro normal."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Incapaz de apagar pasta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' não está vazia. Não foi apagada."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Impossível criar uma pasta com esse nome"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Incapaz de criar directório %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Incapaz de obter pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID cartão já existe"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de pasta especificado é inválido: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Incapaz de renomear '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Incapaz de renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Incapaz de abrir pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Erro fatal de parseamento de correio perto da posição %ld na pasta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Incapaz de verificar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Incapaz de abrir ficheiro: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Incapaz de abrir caixa correio temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Incapaz de fechar pasta origem %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Incapaz de fechar pasta temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Incapaz de renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Resumo e pasta não coincidem, mesmo depois de uma sincronização"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Incapaz de armazenar pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao gravar na caixa de correio temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Falha ao gravar para caixa correio temporária: %s: %s"
@@ -10605,10 +10683,17 @@ msgstr "Adição de mensagem MH cancelada"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Incapaz de adicionar mensagem a pasta mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Incapaz de criar pasta `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' não é um directório."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Incapaz de obter pasta: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10630,6 +10715,29 @@ msgstr "Spool `%s' não é um ficheiro ou directório comum"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Pasta `%s/%s' não existe."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Incapaz de abrir pasta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Pasta `%s' não existe."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Incapaz de criar pasta `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10868,47 +10976,47 @@ msgstr "Incapaz de renomear pasta %s para %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Impossível mover uma pasta para dentro de um dos seus descendentes."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Pasta inexistente: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Incapaz de obter grupo: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Incapaz de enviar mensagem: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Falha no comando NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: A procurar novas mensagens"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Resposta de servidor desconhecida: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Utilizar cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operação falhou: %s"
@@ -10955,7 +11063,7 @@ msgstr "Apagar após %s dia(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11044,7 +11152,7 @@ msgid "No such folder `%s'."
 msgstr "Pasta `%s' inexistente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11098,7 +11206,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio através da aplicação sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11266,7 +11374,7 @@ msgstr "Entrega de correio SMTP via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Incapaz de enviar mensagem: endereço de remetente inválido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "A enviar mensagem"
 
@@ -11372,34 +11480,34 @@ msgstr "Expirou tempo de pedido QUIT: %s"
 msgid "QUIT response error"
 msgstr "Erro de resposta QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro à mensagem"
 
@@ -11520,19 +11628,19 @@ msgstr "<clique aqui para seleccionar uma pasta>"
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "_Assinar sempre as mensagens ao utilizar esta conta"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11541,30 +11649,30 @@ msgstr ""
 "Erro ao ler ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Ficheiro existe, sobrepor?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gravar ficheiro: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao ler ficheiro: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao aceder a ficheiro: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Incapaz de recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11573,7 +11681,7 @@ msgstr ""
 "Incapaz de procurar no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11582,7 +11690,7 @@ msgstr ""
 "Incapaz de truncar ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11591,7 +11699,7 @@ msgstr ""
 "Incapaz de copiar descritor de ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11600,7 +11708,7 @@ msgstr ""
 "Erro ao gravar mensagem automaticamente: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11609,7 +11717,7 @@ msgstr ""
 "Ximian Evolution encontrou ficheiros por gravar de uma sessão anterior.\n"
 "Deseja tentar recupera-los?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11620,43 +11728,43 @@ msgstr ""
 "\n"
 "Deseja gravar as suas alterações?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensagem Modificada"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Auto-gerada"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Escrever uma mensagem"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11664,7 +11772,7 @@ msgstr ""
 "Incapaz de criar janela de composição:\n"
 "Incapaz de activar controlo de selecção de endereços."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11676,7 +11784,7 @@ msgstr ""
 "Certifique-se de que possui instaladas as versões\n"
 "correctas do gtkhtml e libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11684,7 +11792,7 @@ msgstr ""
 "Incapaz de criar janela de composição:\n"
 "Incapaz de activar componente de editor HTML."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12040,7 +12148,7 @@ msgstr "Então"
 msgid "You must specify a folder."
 msgstr "Tem de especificar uma pasta."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Seleccionar Pasta"
@@ -12055,19 +12163,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Mais Tarde"
 
@@ -12155,7 +12263,7 @@ msgstr ""
 "A data da mensagem será comparada com a data\n"
 "do momento em que a filtragem ocorrer."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Pastas Virtuais"
 
@@ -12171,7 +12279,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segundos"
 
@@ -12341,7 +12449,7 @@ msgstr "não está Marcada"
 msgid "Junk Test"
 msgstr "Junho"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
@@ -12449,9 +12557,10 @@ msgstr "começa por"
 msgid "Stop Processing"
 msgstr "Parar Processamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Assunto"
 
@@ -12459,25 +12568,25 @@ msgstr "Assunto"
 msgid "Unset Status"
 msgstr "Retirar Estado"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Nome regra '%s' não é único, seleccione outro."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Adicionar Regra"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Nome regra"
 
@@ -12517,15 +12626,15 @@ msgstr "Assunto contém"
 msgid "Subject does not contain"
 msgstr "Assunto não contém"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Tem de indicar um nome para esta vpasta."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tem de especificar pelo menos uma pasta como origem."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Origem vPasta"
 
@@ -12577,9 +12686,9 @@ msgstr "Visualizador de pasta de Correio Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Controlo preferências de Correio Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Correio"
 
@@ -12587,7 +12696,7 @@ msgstr "Correio"
 msgid "Mail Accounts"
 msgstr "Contas Correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Preferências Correio"
 
@@ -12625,15 +12734,15 @@ msgstr "Tem de especificar um nome de script válido."
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Adicionar assinatura script"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
@@ -12721,7 +12830,6 @@ msgid "Unread messages"
 msgstr "Mensagem Por Ler Seg_uinte"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para seleccionar uma pasta>"
 
@@ -12729,311 +12837,329 @@ msgstr "<clique aqui para seleccionar uma pasta>"
 msgid "Create New Folder"
 msgstr "Criar Nova Pasta"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome pasta:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VPastas"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Caixa Entrada"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "A Ler..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Incapaz de copiar ou mover mensagens para uma Pasta Virtual"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Incapaz de renomear pasta: %s: Operação inválida"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar pasta"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Criar uma nova pasta"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Incapaz de apagar pasta `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Incapaz de apagar pasta: %s: Pasta não existe"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Apagar mesmo a pasta \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Apagar \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Incapaz de renomear pasta: %s: Pasta não existe"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Renomear Pasta"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Åbrir em Nova Janela"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editar como Nova Mensagem..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Reponder ao Remetente"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Reponder para _Lista"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Reponder _a Todos"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Dar Se_guimento..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Marcar _Terminada"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "L_impar Marca"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Marcar como Lida"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Marcar _por Ler"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "_Marcar como Irrele_vante"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar _por Ler"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _Importante"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "R_ecuperar"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para Pasta..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar para Pasta..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Adicionar Remetente ao Li_vro Endereços"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Aplicar _Filtros"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Criar Regra a Par_tir Mensagem"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VPasta no A_ssunto"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VPasta no Remete_nte"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VPasta nos Destinatá_rios"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VPasta na _Lista Distribuição"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VPasta no Remete_nte"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrar no Ass_unto"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrar no _Remetente"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrar no _Destinatário"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrar na _Lista Distribuição"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrar no _Remetente"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Por Omissão"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Imprimir Mensagem"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localização Link"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Clicar para adicionar uma tarefa"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Equivalências:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Atribuida"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Esta mensagem está assinada digitalmente mas não foi provada como autêntica."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Editar assinatura"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
+"Esta mensagem está assinada digitalmente mas não foi provada como autêntica."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Editar assinatura"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13042,85 +13168,85 @@ msgstr ""
 "O bloco_entrada contém uma assinatura inválida, ou uma assinatura que não "
 "pode ser verificada."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Interrompido"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Encriptação PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _Certificado:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certificado ainda não é válido"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ver Imbutido"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Esconder"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
@@ -13164,29 +13290,34 @@ msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 msgid "Formatting message"
 msgstr "A mover mensagens"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Responder-Para"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Aplicação E-mail"
 
@@ -13200,8 +13331,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13219,21 +13350,26 @@ msgstr "Incapaz de parsear mensagem MIME. A mostrar em código."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Incapaz de parsear mensagem MIME. A mostrar em código."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Esquema não suportado"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Incapaz de verificar assinatura de folha"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Incapaz de verificar assinatura de folha"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13245,60 +13381,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Falha ao efectuar cache %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Falha ao efectuar cache %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Falha ao criar canal a '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Falha ao resolver servidor '%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Gravar Como..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mensagem Sem Título"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Reponder ao Remetente"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Link no Browser"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar _mensagem para lista..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adicionar Remetente ao Livro de Endereços"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -13348,18 +13484,18 @@ msgstr "Filtros"
 msgid "-------- Forwarded Message --------"
 msgstr "Mensagem Reencaminhada"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1146
+#: mail/em-utils.c:1149
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "A %a, %Y-%m-%d às %H:%M, %%s escreveu:"
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13368,7 +13504,7 @@ msgstr ""
 "Incapaz de gravar para `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13377,32 +13513,38 @@ msgstr ""
 "`%s' já existe.\n"
 "Sobrepo-lo?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Mensagem"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Ficheiro '%s' não existe ou não é um ficheiro normal."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gravar Mensagem Como..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Endereço"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Correio de %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Incapaz de criar directório temporário: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13416,7 +13558,7 @@ msgstr ""
 "\n"
 "Apagar mesmo estas mensagens?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13445,319 +13587,327 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Assunto por omissão da mensagem."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Assunto por omissão da mensagem."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Procurar texto no corpo da mensagem apresentada"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "_Estilo reencaminhamento:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Assunto por omissão da mensagem."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Assunto por omissão da mensagem."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Estilo _resposta:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Alternar se mostrar ou não barra de pastas"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Alternar se mostrar ou não barra de pastas"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Esvaziar pasta de lixo ao sair"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Esvaziar pasta de lixo ao sair"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Contas Correio"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Executar acções"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Notificação Novo Correio"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Notificação Novo Correio"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Avisar _quando enviar mensagens apenas com destinatários em Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Enviar Mail HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Enviar Mail HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Mo_strar imagens animadas"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Mo_strar imagens animadas"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar mensagem em estilo normal"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Painel Antevisão"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Reproduzir som ao chegar correio novo"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Verificação _Ortográfica"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Fonte _Consola:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Seleccione fonte HTML largura variável para impressão"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13765,172 +13915,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Lista Mensagem em Árvore"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Lista Mensagem em Árvore"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Tornar esta a minha conta por omissão"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Largura v_ariável:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importar"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Importador Elm do Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importador mbox do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Importador Correio Netscape do Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Importador Outlook Express 4 do Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importador mbox do 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está a importar o seu correio Elm antigo"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "A Importar..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Aguarde por favor"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "A importar %s como %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "A analizar %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "A Importar Ficheiros"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13938,16 +14085,44 @@ msgstr ""
 "Evolution encontrou ficheiros de correio Elm\n"
 "Deseja importa-los para o Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Apagar esta pasta"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Seleccionar importador"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "A Importar"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "A Importar Ficheiros"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "A analizar %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro Prioridade \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13973,7 +14148,7 @@ msgstr ""
 "vez de prioridades. Verifique os filtros importados para se certificar\n"
 "de que tudo continua a funcionar como deseja."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13985,7 +14160,7 @@ msgstr ""
 "Árvore\", Que não é suportada pelo Evolution.\n"
 "Estes filtros serão descartados."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13999,31 +14174,24 @@ msgstr ""
 "Esses filtros foram modificados para testar se essa expresão\n"
 "está ou não contida no corpo da mensagem."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está a importar os seus antigos dados Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "A analisar filtros de correio"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "A analisar directório"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "A iniciar importação"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution está a importar os seus antigos dados Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Definições"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Filtros Correio"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14031,11 +14199,20 @@ msgstr ""
 "Evolution encontrou ficheiros de correio Netscape.\n"
 "Deseja que estes sejam importados para o Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution está a importar os seus antigos dados Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "A Importar Ficheiros"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Livro Endereços"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14043,7 +14220,7 @@ msgstr ""
 "Evolution encontrou ficheiros de correio Pine.\n"
 "Deseja que estes sejam importados para o Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14086,19 +14263,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Não preencheu toda a informação necessária."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor Conta Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Nome utilizador:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Caminho"
 
@@ -14150,28 +14327,43 @@ msgstr ""
 "    '%s'\n"
 "E foi actualizado."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tem mensagens por enviar, deseja mesmo sair?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nova Mensagem Correio"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Mensagem Correio"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem correio"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nova VPasta"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtros Correio"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Criar uma nova pasta"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "O URI que o calendário irá mostrar"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14214,7 +14406,7 @@ msgstr ""
 "Introduza informação sobre a forma como vai enviar correio. Se não tiver a "
 "certeza, pergunte ao seu administrador de sistemas ou Fornecedor de Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Gestão de Contas"
 
@@ -14241,121 +14433,116 @@ msgid "Connecting to server..."
 msgstr "A ligar-se ao servidor..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " Verifi_car tipos suportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL não é suportado nesta compilação do Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL não é suportado nesta compilação do evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Encriptar sempre para mim próprio ao enviar correio encriptado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Editor Contas"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informação Conta"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Adicionar Sc_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Adicionar nova assinatura..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Encriptar sempre para mim próprio ao enviar correio encriptado"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Enviar sempre cópia escondida (Bcc) para:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Enviar sempre cópia (_Cc) para:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confiar sempre nas chaves no meu chaveiro ao encrip_tar"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Anexar mensagem original"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Con_junto caracteres:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "C_ores"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "A Verificar Correio Novo"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Verificar ortografia _quando escrevo"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "A Verificar Correio Novo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Cor para palavras _mal escritas:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Compor Mensagens"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14371,283 +14558,279 @@ msgstr ""
 "\n"
 "Clique em \"Aplicar\" para gravar as suas configurações."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Omissão"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Comportamento por Omissão"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Codificação caract_eres por omissão:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "A Apagar Correio"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Assinar sempre as mensagens ao utilizar esta conta"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Não citar mensagem original"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Pasta rascunhos:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Contas Email"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Endereço em_ail:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar pasta de lixo ao sair"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _Certificado:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Assistente de Contas Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Executar Comando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Menos Opções"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Propriedades Fonte"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Cabeçalho"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Imbutido"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiquetas e Cores"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "A Ler Imagens"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configuração Correio"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Localização caixa correio"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Compositor Mensagens"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Visualização Mensagens"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Fontes Mensagem"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notificação Novo Correio"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Nota: não lhe será pedida nenhuma senha até que se ligue pela primeira vez"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informação Opcional"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganização:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID C_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Seleccione uma cor"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar _quando enviar mensagens apenas com destinatários em Bcc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Fontes Impressas"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Dir correio Qmail "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citar mensagem original"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citada"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Recordar esta sen_ha"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Res_ponder-A:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "A Receber Correio"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Opções Recepção"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Recordar esta _senha"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informação Requerida"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Repor Omissões"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_egurança"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Seleccione fonte HTML largura fixa"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione fonte HTML largura fixa para impressão"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Seleccione fonte HTML largura variável"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione fonte HTML largura variável para impressão"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "A Enviar Correio"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Pasta _mensagens enviadas:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensagens Enviadas e Rascunhos"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vidor requer autenticação"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuração Servidor"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tipo Servidor: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Certificado assinado pelo próprio em cadeia"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Especifique nome _ficheiro:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Verificação _Ortográfica"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "mbox Padrão Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14657,7 +14840,7 @@ msgstr ""
 "sua assinatura. O nome que especificar será utilizado\n"
 "apenas para visualização. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14667,7 +14850,7 @@ msgstr ""
 "ortográfica e idioma. A listagem de idiomas reflecte apenas aqueles para os "
 "quais possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14675,15 +14858,15 @@ msgstr ""
 "Indique o nome pelo qual deseja referir-se a esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14693,174 +14876,174 @@ msgstr ""
 "\n"
 "Clique \"Prosseguir\" para começar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Adicionar Assinatura"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Ler sempre as imagens da rede"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Assinar sempre as mensagens ao utilizar esta conta"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo _Autenticação: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo _autenticação: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Verificar novo correio _automaticamente a cada"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Inserir imagens de risonhos _automaticamente"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Emitir _beep ao chegar novo correio"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmar ao expurgar uma pasta"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Assinatura por _omissão:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Omissões"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Não me notificar ao receber novo correio"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Activar"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Estilo reencaminhamento:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Nome completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Junho"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Ler imagens se o remetente estiver no livro de endereços"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Tornar esta a minha conta por omissão"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nunca ler as imagens da rede"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Reproduzir som ao chegar correio novo"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "A _Receber Correio"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Estilo _resposta:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Repor omissões"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Apagar..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "A En_viar Correio"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Mo_strar imagens animadas"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Fonte _Padrão:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Fonte _Consola:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Utilizar ligação segura (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilizar a mesma fonte que as outras aplicações"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "descrição"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "A Pingar %s"
@@ -14883,7 +15066,7 @@ msgstr ""
 "Erro durante execução da operação:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "A Trabalhar"
 
@@ -14895,128 +15078,128 @@ msgstr "A Filtrar Pasta"
 msgid "Fetching Mail"
 msgstr "A Obter Correio"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao armazenar correio no ficheiro temporário %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao armazenar correio no ficheiro temporário %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "A envias \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "A enviar mensagem %d de %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Terminado."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "A gravar mensagem na pasta"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "A mover mensagens para %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "A copiar mensagens para %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar pastas em \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "A abrir pasta %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "A abrir armazenamento %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "A remover pasta %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar pasta '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar pasta '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "A actualizar pasta"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "A expurgar pasta"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar lixo em '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "A obter mensagem %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "A onter %d mensagem(ns)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "A gravar %d mensagem(ns)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15025,7 +15208,7 @@ msgstr ""
 "Incapaz de criar ficheiro de resultado: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15034,11 +15217,11 @@ msgstr ""
 "Erro ao gravar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "A gravar anexo"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15047,22 +15230,22 @@ msgstr ""
 "Incapaz de criar ficheiro de resultado: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A ligar-se novamente a %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15097,38 +15280,38 @@ msgstr "Excepções"
 msgid "Security Information"
 msgstr "Informação Conta"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "A Cancelar..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Caminho: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Enviat & Receber Correio"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "A Actualizar..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
@@ -15237,20 +15420,20 @@ msgstr ""
 "    '%s'\n"
 "E foram actualizadas."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vPastas"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Editar VPasta"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "A tentar editar uma vpasta '%s' que não existe."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nova VPasta"
 
@@ -15580,97 +15763,20 @@ msgstr "Pastas Desligadas"
 msgid "Autocompletion Folders"
 msgstr "Pastas de Completar Automaticamente"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Incapaz de copiar pasta: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Incapaz de mover pasta: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Impossível mover uma pasta sobre ela própria."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Impossível copiar uma pasta sobre si própria."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Impossível mover uma pasta para dentro de um dos seus descendentes."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Especifique uma pasta para onde copiar a pasta \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Copiar Pasta"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Especifique uma pasta para onde mover a pasta \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Mover Pasta"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Incapaz de apagar pasta:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Apagar mesmo a pasta \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Incapaz de renomear pasta:\n"
+"Incapaz de criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "O nome de pasta especificado é inválido: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Pasta seleccionada não pertence a outro utilizador"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Incapaz de remover pasta:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Incapaz de criar a pasta especificada:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sem Título)"
@@ -15811,7 +15917,7 @@ msgstr "Falha ao executar gpg."
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "A fechar ligações..."
 
@@ -15849,6 +15955,10 @@ msgstr "Incapaz de abrir pasta partilhada: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Incapaz de encontrar a pasta partilhada especificada."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "A iniciar importação"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15959,123 +16069,6 @@ msgstr "Base de dados de configuração não encontrada"
 msgid "Generic error"
 msgstr "Erro genérico"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Criar Novo Grupo de Atalhos"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nome grupo:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Deseja mesmo remover o grupo \"%s\" da barra de atalhos?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Renomear Grupo Atalhos"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Renomear grupo de atalhos seleccionado para:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Ícone_s Pequenos"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Mostrar os atalhos como ícones pequenos"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Ícones _Grandes"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Mostrar os atalhos como ícones grandes"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Adicionar Grupo..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Criar um grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Remover este Grupo..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Remover este grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Re_nomear este Grupo..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Renomear este grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Esconder a Barra de Atalhos"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Esconder a barra de atalhos"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Criar Atalhos por _Omissão"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Criar Atalhos por Omissão"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Renomear Atalho"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Renomear atalho seleccionado para:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Abrir a pasta ligada a este atalho"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Abrir numa Nova _Janela"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Abrir a pasta ligada a este atalho numa nova janela"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Renomear este atalho"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Re_mover"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Remover este atalho da barra de atalhos"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Erro ao gravar atalhos."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Atalhos"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Caixa Selecção"
@@ -16086,11 +16079,6 @@ msgstr "Caixa Selecção"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" em \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16395,59 +16383,59 @@ msgstr ""
 "%s: --online e --offline não podem ser utilizados em conjunto.\n"
 "  Utilize %s --help para mais informações.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Seleccionar importador"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _Certificado:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Progresso"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Expressão"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Endereço Email:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Certificado expirou: %s\n"
 "Emissor: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduza Senha para %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16516,7 +16504,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "ID _Certificado:"
@@ -16591,11 +16579,11 @@ msgstr "Unidade Organizacional"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16644,240 +16632,240 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID _Certificado:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID cartão já existe"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID _Certificado:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID _Certificado:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificado não é de confiança"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Assunto é %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Incapaz de processar pasta de spool"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Autoridade Certificação (CA) inválida"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Autoridade Certificação (CA) inválida"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nenhuma Informação"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "anexo"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID _Certificado:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Carolina do Norte"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Expressão"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s em %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Falha na assinatura do certificado"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Inserir"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Assunto é %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Falha na assinatura do certificado"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza Senha para %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "ID _Certificado:"
@@ -17478,7 +17466,8 @@ msgid "_Threaded Message List"
 msgstr "Lis_ta Mensagens em Árvore"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "A_dicionar Remetente ao Livro de Endereços"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17486,7 +17475,8 @@ msgid "A_pply Filters"
 msgstr "A_plicar Filtros"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Adicionar Remetente ao Livro de Endereços"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17941,10 +17931,6 @@ msgstr "For_mato"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Abrir um ficheiro"
@@ -18316,22 +18302,6 @@ msgstr "_Enviar / Receber"
 msgid "_Window"
 msgstr "_Procurar Agora"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimir Resumo"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Imprimir resumo"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Actualizar"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Actualizar a vista"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _Empresa"
@@ -18398,8 +18368,8 @@ msgstr "Com _Categoria"
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18646,23 +18616,23 @@ msgstr "_Procura"
 msgid "_Find Now"
 msgstr "_Procurar Agora"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID Item"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID Subitem"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Procurar Agora"
@@ -18677,6 +18647,206 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Origens Livros Endereços"
+
+#~ msgid "No data provided"
+#~ msgstr "Nenhuns dados indicados"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de abrir ficheiro `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de criar directório %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de criar ficheiro `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' não é um directório."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "A importar %s como %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "A analisar filtros de correio"
+
+#~ msgid "Scanning directory"
+#~ msgstr "A analisar directório"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Incapaz de copiar pasta: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Incapaz de mover pasta: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Impossível mover uma pasta sobre ela própria."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Impossível copiar uma pasta sobre si própria."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Impossível mover uma pasta para dentro de um dos seus descendentes."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Especifique uma pasta para onde copiar a pasta \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Copiar Pasta"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Especifique uma pasta para onde mover a pasta \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Mover Pasta"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de apagar pasta:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Apagar mesmo a pasta \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de renomear pasta:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Pasta seleccionada não pertence a outro utilizador"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Incapaz de remover pasta:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Criar Novo Grupo de Atalhos"
+
+#~ msgid "Group name:"
+#~ msgstr "Nome grupo:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Deseja mesmo remover o grupo \"%s\" da barra de atalhos?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Renomear Grupo Atalhos"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Renomear grupo de atalhos seleccionado para:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Ícone_s Pequenos"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Mostrar os atalhos como ícones pequenos"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Ícones _Grandes"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Mostrar os atalhos como ícones grandes"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Adicionar Grupo..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Criar um grupo de atalhos"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Remover este Grupo..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Remover este grupo de atalhos"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Re_nomear este Grupo..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Renomear este grupo de atalhos"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Esconder a Barra de Atalhos"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Esconder a barra de atalhos"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Criar Atalhos por _Omissão"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Criar Atalhos por Omissão"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Renomear Atalho"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Renomear atalho seleccionado para:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Abrir a pasta ligada a este atalho"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Abrir numa Nova _Janela"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Abrir a pasta ligada a este atalho numa nova janela"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Renomear este atalho"
+
+#~ msgid "Re_move"
+#~ msgstr "Re_mover"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Remover este atalho da barra de atalhos"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Erro ao gravar atalhos."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Atalhos"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" em \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Imprimir Resumo"
+
+#~ msgid "Print summary"
+#~ msgstr "Imprimir resumo"
+
+#~ msgid "Reload"
+#~ msgstr "Actualizar"
+
+#~ msgid "Reload the view"
+#~ msgstr "Actualizar a vista"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Copiar para pasta..."
 
@@ -19320,25 +19490,10 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Lista Mostra Endereços"
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Importador LDIF Evolution"
-
 #, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Importador LDIF Evolution"
 
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "Formato Intercâmbio Dados LDAP (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Importador VCard Evolution"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Importador VCard Evolution"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Searching..."
 #~ msgstr "A Procurar..."
 
@@ -27311,9 +27466,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "Appointments"
 #~ msgstr "Compromissos"
 
-#~ msgid "No appointments."
-#~ msgstr "Nenhum compromisso."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27815,9 +27967,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "Moderate mist"
 #~ msgstr "Névoa moderada"
 
-#~ msgid "Thick mist"
-#~ msgstr "Névoa espessa"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Névoa breve"
 
@@ -28340,9 +28489,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Criar uma nova janela que mostre esta pasta"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Apagar esta pasta"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Mostrar uma pasta diferente"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 793a74e56b..93cd137cae 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.2\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-01-23 14:40-0500\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -48,8 +48,7 @@ msgstr "Configure aqui o autocompletar"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contatos"
 
@@ -89,21 +88,22 @@ msgstr "Controle de configuração das configurações de pasta do Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Gerencie aqui os seus certificados S/MIME"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "O catálogo de endereços '%s' será removido. Você tem certeza que deseja "
 "continuar?"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Novo catálogo de endereços"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -111,65 +111,65 @@ msgstr "Novo catálogo de endereços"
 msgid "Delete"
 msgstr "Excluir"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contato"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Criar um novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Lista de _contatos"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Falha de conexão ao servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Falha de autenticação com o servidor LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Não foi possível realizar consulta na raiz DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "O servidor respondeu sem bases de pesquisa suportadas"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Erro ao buscar informação de schema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "O servidor não respondeu com informação de schema válida"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Migrando..."
 
@@ -186,39 +186,41 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Neste computador"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Configurações do autocompletar"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -232,7 +234,7 @@ msgstr ""
 "resultados nas preferências do servidor de diretório para este\n"
 "catálogo de endereços."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -244,22 +246,22 @@ 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/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -267,7 +269,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/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -275,7 +277,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/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -285,7 +287,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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -293,27 +295,32 @@ 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/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Não é possível abrir o catálogo de endereços"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Acessando servidor LDAP anonimamente"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "A autenticação falhou.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEntre senha para %s (usuário %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr "UID da fonte de contatos que a visão irá exibir"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "A URI que a agenda vai exibir"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList xml para a lista de autocompletar uris"
@@ -359,7 +366,7 @@ msgstr "  E_xibir bases suportadas "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -391,19 +398,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Assistente de criação de catálogo de endereços"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Propriedades do catálogo de endereços"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Fontes do catálogo de endereços"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Fontes de catálogos de endereços..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Sempre"
 
@@ -414,7 +424,8 @@ msgstr "Anonimamente"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -423,51 +434,51 @@ msgstr ""
 "Por favor, clique no botão \"Concluir\" para salvar as configurações que "
 "foram feitas aqui."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Conectando"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Distinguished name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Endereço eletrônico:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "O Evolution usará este DN para autenticá-lo no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "O Evolution usará este endereço eletrônico para autenticá-lo no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Concluído"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -483,23 +494,23 @@ msgstr ""
 "a sua conexão. Pergunte ao seu administrador de sistema se o seu servidor "
 "LDAP usa estes protocolos."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Um"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Escopo de pesquisa: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Pesquisando"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Selecionada:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -509,7 +520,7 @@ msgstr ""
 "com o seu servidor\n"
 "LDAP se este suportar SSL ou TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -527,7 +538,7 @@ msgstr ""
 "conexão já é\n"
 "segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -541,7 +552,7 @@ msgstr ""
 "falhas de\n"
 "segurança."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -552,40 +563,42 @@ msgstr ""
 "Evolution para\n"
 "pesquisas LDAP e para a criação e edição de contatos. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Especificar um nome para exibição e um grupo é o primeiro passo necessário "
 "para configurar um catálogo de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Passo 1: Características da pasta"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Passo 2: Informação do servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Passo 3: Conectando ao servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Passo 4: Pesquisando no diretório"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Bases de pesquisa suportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -599,7 +612,7 @@ msgstr ""
 "sistemas caso você\n"
 "precise alterar estas opções."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -611,7 +624,7 @@ msgstr ""
 "começarão. Se você deixar este campo vazio as pesquisas começarão na raiz da "
 "árvore do diretório."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -627,11 +640,13 @@ msgstr ""
 "Um escopo de pesquisa de \"um\" incluirá apenas as entradas que estão um "
 "nível abaixo da sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -642,7 +657,7 @@ msgstr ""
 "administrador de sistemas caso você precise de ajuda para descobrir esta\n"
 "informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -650,17 +665,18 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Este é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
 "grande \n"
 "a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -669,7 +685,7 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço eletrônico\" requer acesso anônimo ao seu servidor LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -678,7 +694,7 @@ msgstr ""
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution.\n"
 "Ele é usado apenas para exibição. "
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -687,7 +703,7 @@ msgstr ""
 "Este é o nome que aparecerá na sua lista de pastas do Evolution. Ele é usado "
 "apenas para exibição. "
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -699,28 +715,28 @@ msgstr ""
 "de portas padrão foi fornecida. Pergunte ao seu administrador de sistemas\n"
 "qual porta você deve escolher."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Esta opção controla o tempo de execução de uma pesquisa."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "_Usar SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Usando distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Usando endereço eletrônico"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Quando possível"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -732,19 +748,19 @@ msgstr ""
 "informação de login. Por favor, consulte o seu administrador de sistemas se "
 "você não souber esta informação."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Nome para exibição:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -753,39 +769,39 @@ msgstr "_Limite de transferência:"
 msgid "_Edit"
 msgstr "E_ditar"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Método de _login:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "Número da _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Base de pesquisa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Nome do _servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Tempo limite (minutos):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -900,7 +916,7 @@ msgstr "Colaboração"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -994,10 +1010,10 @@ msgstr "Ca_tegorias..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1045,15 +1061,15 @@ msgid "_Web page address:"
 msgstr "Endereço da página _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2037,102 +2053,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Serviço"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Local"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Residencial"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Trabalho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Catálogo origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Catálogo alvo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Contato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "É um novo contato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Campos editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nome da conta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Editor de categorias não disponível."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Salvar contato como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2140,7 +2165,7 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "excluir estes contatos?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2148,46 +2173,51 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "excluir este contato?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Comercial"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Não foi possível encontrar widget para um campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Adicionar rápido de contato"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Nome _completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
@@ -2344,11 +2374,11 @@ msgid "Is New List"
 msgstr "É nova lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Salvar lista como VCard"
 
@@ -2437,13 +2467,13 @@ msgid "Email begins with"
 msgstr "E-mail começa com"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
@@ -2460,101 +2490,100 @@ msgid "Type"
 msgstr "Tipo"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Catálogo de endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Novo contato..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nova lista de contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Pesquisar contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Fontes de catálogos de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Configurações do pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Catálogo de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Catálogo de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Visão atual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2566,8 +2595,8 @@ msgstr ""
 "capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
@@ -2610,7 +2639,7 @@ msgid "Company Phone"
 msgstr "Telefone da empresa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mail"
 
@@ -2669,7 +2698,7 @@ msgid "Nickname"
 msgstr "Apelido"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Nota"
 
@@ -2678,7 +2707,7 @@ msgid "Office"
 msgstr "Escritório"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Empresa"
 
@@ -2804,67 +2833,73 @@ msgstr "Selecionado"
 msgid "Has Cursor"
 msgstr "Possui cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Listar membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Trabalho"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Descrição"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "URL _vídeo conferência:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Telefone do carro"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Pessoal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Função"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Página web"
 
@@ -2873,8 +2908,8 @@ msgid "Success"
 msgstr "Sucesso"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2904,7 +2939,7 @@ msgstr "Protocolo não suportado"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2924,7 +2959,8 @@ msgid "TLS not Available"
 msgstr "TLS não disponível"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Catálogo de endereços não existe"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3059,7 +3095,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Adicionar endereço a um contato existente \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Consultando catálogo de endereços..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3114,17 +3151,40 @@ msgstr "Copyright © 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "This should test the reflow canvas item"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Importador Elm do Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Importador iCalendar do Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Importador vCalendar do Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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 envelope"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Imprimir contatos"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Imprimir contato"
 
@@ -3216,7 +3276,7 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "Número de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opções"
 
@@ -3395,8 +3455,8 @@ msgstr "Não foi fornecido um nome de arquivo."
 msgid "Unnamed List"
 msgstr "Lista sem nome"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Entre a senha"
 
@@ -3473,10 +3533,9 @@ msgid "Evolution's Tasks component"
 msgstr "Componente de tarefas do Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -3520,26 +3579,26 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "A_brir"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "I_gnorar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "Ignorar _todos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Sem descrição disponível."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3552,12 +3611,12 @@ msgstr ""
 "Iniciando em %s\n"
 "Terminando em %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Alerta"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3569,7 +3628,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3586,19 +3645,19 @@ msgstr ""
 "\n"
 "Você tem certeza que deseja executar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte sobre este programa novamente."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Não foi possível iniciar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 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"
 
@@ -3734,24 +3793,30 @@ msgstr "Se as horas são exibidas no formato 24h no lugar de se usar am/pm"
 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/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Descrição contém"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Não casadas"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3781,7 +3846,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3803,70 +3868,70 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "A agenda '%s' será removida. Você tem certeza que deseja continuar?"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Nova agenda"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Reunião"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Criar um novo pedido de reunião"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia inteiro"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Compromisso de _dia inteiro"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia inteiro"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Nova agenda"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "A_genda"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Criar uma nova agenda"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Não é possível abrir a agenda '%s' para criar eventos e reuniões"
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não há agenda disponível para criar eventos e reuniões"
 
@@ -3998,7 +4063,7 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Ação/gatilho"
 
@@ -4070,7 +4135,7 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4081,7 +4146,7 @@ msgstr "início do compromisso"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Ativado"
 
@@ -4131,7 +4196,7 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alertas"
 
@@ -4156,7 +4221,7 @@ msgid "Days"
 msgstr "Dias"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_tivar"
 
@@ -4296,7 +4361,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Geral"
 
@@ -4394,7 +4459,7 @@ msgstr ""
 "foram feitas aqui."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
@@ -4563,23 +4628,23 @@ msgstr "%s  Você não fez alterações, atualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validação: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " para "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Concluída "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Concluída "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Prazo "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Prazo "
 
@@ -4615,8 +4680,8 @@ msgstr "Item de diário - %s"
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Salvar como..."
 
@@ -4646,10 +4711,21 @@ msgstr "Publicando destino"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Selecione fonte destino"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Agenda"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Nova lista de tarefas"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4752,7 +4828,7 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Compromisso"
 
@@ -4776,23 +4852,32 @@ msgstr "Agendar"
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "O prazo de conclusão é anterior à data de início!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "A data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Não é possível abrir a agenda '%s'."
@@ -4868,29 +4953,29 @@ msgstr "Hora de _início:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionada já não possui uma conta."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -5080,7 +5165,7 @@ msgstr "no"
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Data/hora"
 
@@ -5113,7 +5198,7 @@ msgid "_No recurrence"
 msgstr "_Sem repetição"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -5155,7 +5240,7 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Descartar alterações"
 
@@ -5179,7 +5264,7 @@ msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "A informação da tarefa foi alterada. Enviar uma versão atualizada?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
 
@@ -5192,7 +5277,7 @@ msgstr "% C_oncluída"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Concluída"
 
@@ -5205,7 +5290,7 @@ msgstr "Alta"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Em progresso"
 
@@ -5224,7 +5309,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Não iniciada"
 
@@ -5263,16 +5348,16 @@ msgstr "Básico"
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "O prazo de conclusão é anterior à data de início!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Não é possível abrir tarefas em '%s'."
@@ -5283,7 +5368,7 @@ msgstr "_Confidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -5467,11 +5552,10 @@ msgstr "Data de início"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "cor"
 
@@ -5496,7 +5580,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "L"
 
@@ -5531,10 +5615,10 @@ msgstr "Não"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -5547,99 +5631,105 @@ msgstr "Repetindo"
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "A_brir"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salvar como..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: calendar/gui/e-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorrência"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorrências"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Configurações..."
 
@@ -5726,7 +5816,7 @@ msgid "Alarms"
 msgstr "Alarmes"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Concluída"
 
@@ -5784,26 +5874,26 @@ msgstr "%02i frações de minuto"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5986,7 +6076,7 @@ msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6442,12 +6532,12 @@ msgstr "Prioridade:"
 msgid "Web Page:"
 msgstr "Página web:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6457,7 +6547,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6465,12 +6555,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6479,28 +6569,38 @@ msgstr ""
 "Erro abrindo %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Carregando tarefas"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6619,16 +6719,16 @@ msgstr "Informação de livre/ocupado (%s para %s)"
 msgid "iCalendar information"
 msgstr "Informação iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Entre a senha para %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -6641,7 +6741,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
@@ -6654,12 +6754,12 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversários e bodas"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "Na web"
 
@@ -6848,49 +6948,49 @@ msgstr "Mês selecionado (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Tarefa"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem concluída: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Imprimir item"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Configurar impressão..."
 
@@ -6900,37 +7000,37 @@ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "A lista de tarefas '%s' será removida. Você tem certeza que deseja continuar?"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "Lista de _tarefas"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Não é possível abrir a lista de tarefas '%s' para criar eventos e reuniões"
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe agenda disponível para a criação de tarefas"
 
@@ -6988,20 +7088,20 @@ msgstr "Arquivos iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Arquivos vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Excluir permanentemente compromissos e reuniões antigas"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Lembrete!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Eventos de agenda"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7009,7 +7109,7 @@ msgstr ""
 "O Evolution encontrou arquivos da Agenda Gnome.\n"
 "Você gostaria de importá-los para o Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Agenda Gnome"
 
@@ -8671,7 +8771,7 @@ msgstr "Não é possível abrir mensagem"
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
@@ -8756,7 +8856,7 @@ msgstr "Copiando mensagens"
 msgid "Filtering new message(s)"
 msgstr "Filtrando novas mensagem(ns)"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8767,15 +8867,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Falhou a análise da dica de id de usuário do gpg."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falhou a análise da requisição de frase-senha do gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8784,31 +8884,27 @@ msgstr ""
 "Você precisa de uma frase-senha para destravar a chave\n"
 "para o usuário: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falhou o destravamento da chave secreta: fornecidas 3 frases-senha inválidas."
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Não foram fornecidos dados"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falhou a cifragem: Não foram especificados destinatários válidos."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8819,34 +8915,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Falhou a execução de GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Não foi possível gerar dados de assinatura: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falhou a execução do gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Falhou a execução do gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
@@ -8854,27 +8950,27 @@ msgstr ""
 "Não é possível verificar assinatura da mensagem: Formato de mensagem "
 "incorreto"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Não é possível verificar assinatura da mensagem: não foi possível criar "
 "arquivo temporário: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Não foi possível gerar dados de cifragem: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem cifrada digitalmente"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Conteúdo cifrado"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Não foi possível analisar conteúdo da mensagem"
 
@@ -8986,23 +9082,36 @@ msgstr "Falhou a decifragem da parte MIME: estrutura inválida"
 msgid "parse error"
 msgstr "erro de análise"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Provedor de correio em pastas virtuais"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Não foi possível carregar %s: A carga de módulos não é suportada neste "
 "sistema."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Não foi possível carregar %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Não foi possível carregar %s: Sem código de inicialização no módulo."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Não existe provedor disponível para o protocolo `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anônimo"
@@ -9165,7 +9274,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9303,20 +9412,7 @@ msgstr "Falhou a consulta de máquina: máquina não encontrada"
 msgid "Host lookup failed: unknown reason"
 msgstr "Falhou a consulta de máquina: razão desconhecida"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Provedor de correio em pastas virtuais"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Não existe provedor disponível para o protocolo `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9379,21 +9475,25 @@ msgstr "Autor da assinatura: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Não é possível obter pasta: Operação inválida neste repositório"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Não é possível criar pasta: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Não é possível criar pasta: Operação inválida neste repositório"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Não é possível excluir pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Lixeira"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Lixo"
@@ -9626,21 +9726,31 @@ msgstr "Não existe tal mensagem %s em %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Não é possível excluir pasta: %s: Não existe tal pasta"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não é possível renomear pasta: %s: Operação inválida"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Você não pode copiar mensagens de uma pasta NNTP!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Você não pode copiar mensagens de uma pasta NNTP!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9656,14 +9766,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Aplicar filtros às novas mensagens na caixa de entrada deste servidor"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Sincronizar automaticamente correio remoto localmente"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Catálogo de endereços"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "Nome do servidor LDAP:"
@@ -9682,44 +9788,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Para acesssar servidores Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Senha"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opção estabelelece conexão com o servidor IMAP usando uma senha em "
 "texto claro."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Padrão"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "lista"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor se desconectou inesperadamente: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9728,26 +9832,26 @@ msgstr ""
 "Alerta do servidor IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Resposta do servidor IMAP não contém informação de %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
@@ -9762,7 +9866,7 @@ msgstr "Não foi possível criar o diretório %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Não foi possível carregar resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "A pasta foi destruída e recriada no servidor."
 
@@ -9771,12 +9875,12 @@ msgstr "A pasta foi destruída e recriada no servidor."
 msgid "Scanning for changed messages"
 msgstr "Varrendo a procura de mensagens alteradas"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Não foi possível buscar a mensagem: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9792,25 +9896,25 @@ msgstr ""
 "Não é possível obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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ão existe tal mensagem"
 
-#: camel/providers/imap/camel-imap-folder.c:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Esta mensagem não está disponível no momento"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Pegando informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Não foi possível localizar corpo da mensagem na resposta FETCH."
 
@@ -9865,27 +9969,37 @@ msgstr "Espaço de nomes"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros às novas mensagens na caixa de entrada deste servidor"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Verificar novas mensagem em todas as pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Verificar novas mensagem em todas as pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Serviço IMAP para %s em %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9894,64 +10008,64 @@ msgstr "Serviço IMAP para %s em %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Não foi possível conectar à %s (porta %d): %s."
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL não disponível"
 
-#: camel/providers/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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 "Conexão cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falhou a conexão ao servidor IMAP %s em modo seguro: %s"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falharam as negociações SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Não foi possível conectar com o comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s não suporta o tipo de autenticação pedido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Você não entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9962,24 +10076,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Não existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Não é possível criar pasta: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "O nome de pasta \"%s\" é inválido pois contém o caractere \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não pode conter sub-pastas"
 
@@ -10004,7 +10126,7 @@ msgstr ""
 "\n"
 " !!! NÃO USE ISTO COM CORREIO DE PRODUÇÃO  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Não foi possível conectar ao servidor POP em %s"
@@ -10087,8 +10209,8 @@ msgstr ""
 "Pode também ser usado para ler uma árvore de pastas do Elm, Pine ou Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10100,55 +10222,55 @@ msgid "Store root %s is not a regular directory"
 msgstr "Raiz de armazenagem %s não é um diretório comum"
 
 #: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Não é possível obter pasta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Repositórios locais não possuem uma caixa de entrada"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Não foi possível renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Não foi possível renomear '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Não foi possível excluir arquivo de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Não foi possível excluir arquivo de índice de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Não foi possível excluir meta arquivo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Não foi possível salvar resumo: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Não é possível adicionar mensagem ao resumo: razão desconhecida"
 
@@ -10166,53 +10288,44 @@ msgstr "Não é possível acrescentar mensagem à pasta maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Conteúdo de mensagem inválido"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível abrir pasta `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Não é possível obter pasta: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Pasta `%s' não existe."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível criar pasta `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Não é possível criar pasta: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' não é um diretório maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Não foi possível excluir a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "não é um diretório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10234,9 +10347,9 @@ msgid "Checking for new messages"
 msgstr "Verificando novas mensagens"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Armazenando pasta"
@@ -10280,156 +10393,134 @@ msgstr "A pasta aparenta estar corrompida de modo irrecuperável."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: Caixa postal corrompida?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível abrir arquivo `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Não é possível criar uma pasta com este nome."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível criar diretório `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Não é possível anexar arquivo %s: não é um arquivo comum"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Não foi possível criar arquivo `%s':\n"
+"Não foi possível excluir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' não é um arquivo comum."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Não foi possível excluir pasta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' não está vazia. Ela não foi excluída."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Não é possível criar uma pasta com este nome."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Não foi possível criar o diretório `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Não é possível criar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "A pasta já existe"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "O novo nome de pasta não é válido."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Não foi possível renomear '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Não foi possível renomear %s para %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Não foi possível abrir pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Erro fatal do analisador de correio próximo à posição %ld na pasta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Não é possível checar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Não foi possível abrir arquivo: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Não é possível abrir caixa postal temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Não foi possível fechar pasta fonte %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Não foi possível fechar pasta temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Não foi possível renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e a pasta não casam, mesmo após uma sincronização"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Não foi possível armazenar pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escrever para a caixa postal temporária: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Falha ao escrever para a caixa postal temporária: %s: %s"
@@ -10443,10 +10534,17 @@ msgstr "Cancelado o acréscimo de mensagem MH"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Não é possível acrescentar mensagem a pasta MH: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Não foi possível criar pasta `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' não é um diretório."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Não é possível obter pasta: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10468,6 +10566,29 @@ msgstr "Fila `%s' não é um arquivo comum ou um diretório"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Pasta `%s/%s' não existe."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Não foi possível abrir pasta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Pasta `%s' não existe."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Não foi possível criar pasta `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10708,46 +10829,46 @@ msgstr ""
 "Não é possível remover uma pasta de um repositório de notícias: é possível "
 "cancelar a assinatura."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Erro de conexão: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Não existe a pasta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Não foi possível obter grupo: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Não foi possível obter mensagens: erro não especificado"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Falhou o comando NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Varrendo novas mensagens"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Resposta desconhecida do servidor: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Usar cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Falhou a operação: %s"
@@ -10794,7 +10915,7 @@ msgstr "Excluir após %s dia(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Desativar suporte para todas as extensões do POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10883,7 +11004,7 @@ msgid "No such folder `%s'."
 msgstr "Não existe a pasta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10940,7 +11061,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11106,7 +11227,7 @@ msgstr "Entrega de correio SMTP via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Não é possível enviar mensagem: endereço do remetente não é válido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
@@ -11214,34 +11335,34 @@ msgstr "Tempo excedido no pedido QUIT: %s"
 msgid "QUIT response error"
 msgstr "Erro na resposta de QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo à mensagem"
 
@@ -11357,14 +11478,14 @@ msgstr "Clique aqui para selecionar as pastas onde publicar"
 msgid "Attach file(s)"
 msgstr "Anexar arquivo(s)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Não é possível assinar a mensagem a ser enviada: Não existe certificado de "
 "assinatura configurado para esta conta"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11372,7 +11493,7 @@ msgstr ""
 "Não é possível cifrar a mensagem a ser enviada: Não existe certificado de "
 "cifragem configurado para esta conta"
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11381,30 +11502,30 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível obter mensagem do editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11413,7 +11534,7 @@ msgstr ""
 "Não é possível acessar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11422,7 +11543,7 @@ msgstr ""
 "Não é possível truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11431,7 +11552,7 @@ msgstr ""
 "Não é possível copiar descritor de arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11440,7 +11561,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11448,7 +11569,7 @@ msgstr ""
 "O Ximian Evolution encontrou mensagens não salvas de uma sessão anterior.\n"
 "Você gostaria de tentar recuperá-las?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11459,43 +11580,43 @@ msgstr ""
 "\n"
 "Você deseja salvar as suas modificações?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Assinatura:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Auto-gerado"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> arquivo anexado"
 msgstr[1] "<b>%d</b> arquivos anexados"
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Esconder barra de _anexos (solte aqui os anexos)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Exibir barra de _anexos (solte aqui os anexos)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11503,7 +11624,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o controle seletor de endereços."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11515,7 +11636,7 @@ msgstr ""
 "Por favor, verifique se você possui as versões\n"
 "corretas de gtkhtml e libgtkhtml instaladas.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11523,7 +11644,7 @@ msgstr ""
 "Não foi possível criar janela de redator:\n"
 "Não é possível ativar o componente editor de HTML."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11877,7 +11998,7 @@ msgstr "Então"
 msgid "You must specify a folder."
 msgstr "Você deve especificar uma pasta."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Selecionar pasta"
@@ -11892,19 +12013,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "A fazer"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Mais tarde"
 
@@ -11992,7 +12113,7 @@ msgstr ""
 "A data da mensagem será comparada em relação\n"
 "ao instante atual quando a filtragem ocorrer."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Pastas virtuais"
 
@@ -12008,7 +12129,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "segundos"
 
@@ -12177,7 +12298,7 @@ msgstr "não está Marcada"
 msgid "Junk Test"
 msgstr "Teste lixo"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Rótulo"
@@ -12283,9 +12404,10 @@ msgstr "começa com"
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Assunto"
 
@@ -12293,25 +12415,25 @@ msgstr "Assunto"
 msgid "Unset Status"
 msgstr "Desconfigurar estado"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "O nome de regra '%s' não é único, escolha outro."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Editar regra"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -12351,15 +12473,15 @@ msgstr "Assunto contém"
 msgid "Subject does not contain"
 msgstr "Assunto não contém"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Você deve nomear esta pasta virtual."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Você precisa especificar pelo menos uma pasta como uma fonte."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Fonte de pastas virtuais"
 
@@ -12412,9 +12534,9 @@ msgstr "Visualizador de pastas do correio do Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Controle de preferências do correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Correio"
 
@@ -12422,7 +12544,7 @@ msgstr "Correio"
 msgid "Mail Accounts"
 msgstr "Contas de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Preferências de correio"
 
@@ -12460,15 +12582,15 @@ msgstr "Você deve especificar um nome de script válido."
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Língua(s)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Adicionar script de assinatura"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
@@ -12554,7 +12676,6 @@ msgid "Unread messages"
 msgstr "Mensagens não lidas"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
@@ -12562,292 +12683,310 @@ msgstr "<clique aqui para selecionar uma pasta>"
 msgid "Create New Folder"
 msgstr "Criar nova pasta"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "Neste computador"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "NÃO CASADO"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Não é possível renomear pasta: %s: Operação inválida"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Criar pasta"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Não foi possível excluir pasta: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Não é possível excluir pasta: %s: Não existe tal pasta"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Excluir mesmo pasta \"%s\" e todas as suas sub-pastas?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Excluir \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Renomear pasta"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Uma pasta chamada \"%s\" já existe. Por favor use um nome diferente."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Abrir em nova _janela"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "_Mover"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Encamin_har"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "_Continuar..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Marcar como concl_uída"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marcar como i_mportante"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Marcar como sem imp_ortância"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Marcar como _lixo"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _não lixo"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para pasta..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálo_go de endereços"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _assunto"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "Pasta virtual por en_cadeamento"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtro por a_ssunto"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtro por r_emetente"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtro por des_tinatários"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtro por l_ista de discussão"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Filtro por encadeamento"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Padrão"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "Copiar local do _vínculo"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Ocorrências: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Não assinado"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Esta mensagem não está assinada. Não há garantias quanto a autenticidade de "
 "seu remetente."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que o remetente "
 "desta mensagem seja quem alega ser."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12855,11 +12994,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:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, não é possível verificar remetente"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12867,11 +13006,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Não cifrada"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12879,11 +13018,11 @@ 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:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr "Cifrada, cifra fraca"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -12893,11 +13032,11 @@ 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12905,11 +13044,11 @@ msgstr ""
 "Esta mensagem está cifrada. Seria difícil que um estranho conseguisse ver o "
 "conteúdo desta mensagem."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr "Cifrada, cifra forte"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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 "
@@ -12919,35 +13058,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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é observável"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 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:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Ver embutido"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
@@ -12990,29 +13129,34 @@ msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 msgid "Formatting message"
 msgstr "Formatando mensagem"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "De"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Programa de correio"
 
@@ -13026,8 +13170,8 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13044,19 +13188,24 @@ msgstr "Não foi possível analisar mensagem S/MIME: Erro desconhecido"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Erro desconhecido ao verificar assinatura"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (embutido)"
 
@@ -13072,56 +13221,56 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Falhou a migração dos caches de pop3 uid: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Falhou a migração do estado de expansão das pastas: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Falhou a criação do diretório `%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Falhou a abertura do repositório para `%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagem_sem_nome.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Usar como imagem de _fundo"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "Abrir vínculo no _navegador"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "Enviar _mensagem a..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -13168,17 +13317,17 @@ msgstr "Filtros"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13187,7 +13336,7 @@ msgstr ""
 "Não é possível salvar para `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13196,29 +13345,35 @@ msgstr ""
 "`%s' já existe.\n"
 "Sobrescrevê-lo?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "mensagem"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Erro: '%s' existe e não é um arquivo comum"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Salvar mensagem..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Adicionar endereço"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Correio de %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Não foi possível criar diretório temporário: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13232,7 +13387,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13258,80 +13413,94 @@ msgid "Check incoming mail being junk"
 msgstr "Verificar se mensagens recebidas são lixo"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Verificar se mensagens recebidas são lixo para contas IMAP"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Cor de ênfase de citação"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Cor de ênfase de citação."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres padrão para compor mensagens"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres padrão para compor mensagens."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres padrão para exibir mensagens"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres padrão para exibir mensagens."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Estilo de encaminhamento padrão"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Assunto padrão para a mensagem."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Assunto padrão para a mensagem."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Estilo de resposta padrão"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Largura padrão do painel da barra de pastas"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Largura padrão do painel da barra de pastas"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Desenhar indicadores de erros ortográficos enquanto você digita."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Esvaziar lixeiras ao sair"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Esvaziar todas as lixeiras ao sair do Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Ativar o modo cursor, de forma que você veja um cursor ao ler correio."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Ativar/desativar o modo cursor"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Altura do painel de lista de mensagens"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Altura do painel de lista de mensagens."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13342,15 +13511,15 @@ msgstr ""
 "componente visualizador bonobo no banco de dados de tipos MIME do Gnome "
 "podem ser usados para exibir conteúdo."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Lista de rótulos e as suas respectivas cores"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13359,11 +13528,11 @@ msgstr ""
 "contém strings com nomes de sub-diretórios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeçalhos personalizados e se eles estão ativados."
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13371,15 +13540,15 @@ msgstr ""
 "Lista de rótulos que o componente de correio do Evolution conhece. A lista "
 "contém strings contendo nome:cor, onde a cor usa a codificação hex HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos MIME a procurar componente visualizador bonobo."
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Carregar imagens em mensagens HTML usando HTTP"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13389,82 +13558,82 @@ msgstr ""
 "- Nunca carrege imagens da rede 1 - Carregue imagens se o remetende está no "
 "catálogo de endereços 2 - Sempre carrege imagens da rede"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Registrar ações dos filtros"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar ações dos filtros no arquivo de registro especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Arquivo de registro onde registrar ações dos filtros"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Arquivo de registro onde registrar ações dos filtros."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como lida após o tempo limite especificado"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como lida após o tempo limite especificado."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citações na visualização da mensagem"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citações na visualização da mensagem."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Estilo de exibição de mensagem (normal, todos os cabeçalhos, fonte)"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Arquivo de som para notificação de nova mensagem"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Tipo de notificação de nova mensagem"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Perguntar em caso de assunto vazio"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Perguntar ao usuário quando ele tenta excluir permanentemente uma pasta."
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Perguntar ao usuário quando ele tenta enviar uma mensagem com assunto vazio."
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Perguntar quando o usuário exclui permanentemente"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Perguntar quando o usuário preenche apenas o Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13472,102 +13641,94 @@ msgstr ""
 "Perguntar quando o usuário tenta enviar mensagem HTML para contatos que não "
 "as querem."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Perguntar quando o usuário tenta enviar uma mensagem sem destinatários Para "
 "ou Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Perguntar quando o usuário tenta enviar HTML indesejado"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Reconhecer vínculos no texto e substitui-los."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconhecer carinhas no texto e substitui-las por imagens."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Executar teste de lixo nas mensagens recebidas"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Executar teste de lixo nas mensagens recebidas para contas IMAP (válido "
-"apenas se \"check_incoming\" for \"true\")"
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Enviar correio HTML por padrão"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Enviar correio HTML por padrão."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Exibir animações"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Exibir imagens animadas como animações."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Exibir mensagens excluídas (riscadas) na lista de mensagens."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Exibir mensagens excluídas na lista de mensagens"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Exibir o painel de visualização"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Exibir o painel de visualização."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Arquivo de som a tocar quando uma nova mensagem chega."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Especifica o tipo de notificação de nova mensagem que o usuário deseja usar."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Verificação ortográfica durante digitação"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Fonte de terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "A fonte de terminal para exibição de correio"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "A fonte de largura variável para exibição de correio"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13579,99 +13740,99 @@ msgstr ""
 "&lt;header enabled&gt; - configure enabled se o cabeçalho deve ser exibido "
 "junto com a mensagem."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Encadear a lista de mensagens."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Encadear a lista de mensagens"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Encadear a lista de mensagens baseado no assunto"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Tempo limite para marcar a mensagem como lida"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Tempo limite para marcar a mensagem como lida."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "String UID da conta padrão."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Usar o daemon e cliente do Spamasssassin"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Usar o daemon e cliente do Spamasssassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Usar fontes personalizadas"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar fontes personalizadas para exibir as mensagens"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Usar apenas testes de SPAM locais."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar apenas os testes de SPAM locais (sem DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Fonte de largura variável"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Item de menu Ver/Bcc está selecionado"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Item de menu Ver/Bcc está selecionado."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Item de menu Ver/Cc está selecionado"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Item de menu Ver/Cc está selecionado."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Item de menu Ver/De está selecionado"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Item de menu Ver/De está selecionado."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Item de menu Ver/PublicarEm está selecionado"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Item de menu Ver/PublicarEm está selecionado."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Item de menu Ver/ResponderA está selecionado"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Item de menu Ver/ResponderA está selecionado."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13679,69 +13840,66 @@ msgstr ""
 "Se deve-se ou não reverter a encadeamento por assunto quando as mensagens "
 "não contém cabeçalhos In-Reply-To ou References."
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "porta para iniciar o spamd executado pelo usuário"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "porta do spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Importador Elm do Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Importador mbox do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Importador Netscape Mail do Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Importador Outlook Express 4 do Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importador mbox do 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution está importando seu correio antigo Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importando %s como %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Varrendo %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importando arquivos"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13749,16 +13907,44 @@ msgstr ""
 "O Evolution encontrou arquivos de correio Elm\n"
 "Você gostaria de importá-los para o Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "P_asta de rascunhos:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Selecionar um certificado a importar..."
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importando"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importando arquivos"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Varrendo %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filtro de prioridade \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13784,7 +13970,7 @@ msgstr ""
 "pontuações em lugar de prioridades. Verifique os filtros importados\n"
 "para garantir que tudo ainda funciona como esperado."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13796,7 +13982,7 @@ msgstr ""
 "encadeamento\" que não são suportadas pelo Evolution.\n"
 "Estes filtros serão removidos."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13810,31 +13996,24 @@ msgstr ""
 "filtros foram modificados para testar se essa cadeia\n"
 "está ou não contida no corpo da mensagem."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "O Evolution está importando seus dados antigos do Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Varrendo filtros de correio"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Varrendo diretório"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Iniciando a importação"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "O Evolution está importando seus dados antigos do Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Configurações"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Filtros de correio"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13842,11 +14021,20 @@ msgstr ""
 "O Evolution encontrou arquivos de correio do Netscape.\n"
 "Você gostaria de importá-los para o Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "O Evolution está importando seus dados antigos do Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importando arquivos"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Catálogo de endereços"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13854,7 +14042,7 @@ msgstr ""
 "O Evolution encontrou arquivos de correio do Pine.\n"
 "Você gostaria de importá-los para o Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13897,19 +14085,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Você não preencheu toda a informação exigida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Caminho:"
 
@@ -13961,27 +14149,42 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nova pasta virtual"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filtros de correio"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Criar uma nova agenda"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "A URI da fonte de correio que a visão vai exibir"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14025,7 +14228,7 @@ msgstr ""
 "tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
 "Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Gerência de conta"
 
@@ -14052,118 +14255,114 @@ msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL não é suportado nesta cópia do Evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Cabeçalhos de correio exibidos</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Cifrar também para mim mesmo ao en_viar correio cifrado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informação de conta"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Adicionar s_cript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Adicionar nova assinatura..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Cifrar sempre para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Enviar sempre uma cópia oc_ulta (Bcc) para:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Enviar sempre uma _cópia (Cc) para:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Con_fiar sempre nas chaves em meu chaveiro ao cifrar"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Anexar mensagem original"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Cores"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "_Testar mensagens recebidas"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia enquanto eu _digito"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Verificando novas mensagens"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Testa se mensagens recebidas são lixo"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Cor das palavras _erradas:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Redigindo mensagens"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Configuração"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14179,139 +14378,135 @@ msgstr ""
 "\n"
 "Pressione \"Aplicar\" para salvar suas configurações."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Padrão"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Comportamento padrão"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Co_dificação de caracteres padrão:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Excluindo correio"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Assinar digitalmente mensagens enviadas (por padrão)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "_Não verifique mensagens recebidas para contas IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Não citar a mensagem original"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "P_asta de rascunhos:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Contas de correio"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Endereço e_letrônico:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_fragem:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Opções de filtragem"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Propriedades da fonte"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "Ca_beçalhos"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Embutido"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Rótulos e cores"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Carregando imagens"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configuração de correio"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Localização da caixa postal"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Redator de mensagens"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Exibição de mensagens"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Fontes de mensagem"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notificação de nova mensagem"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14319,139 +14514,139 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informação opcional"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Empres_a:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da c_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Fontes de impressão"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citar mensagem original"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Respon_der-a:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Opções de recepção"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informação exigida"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Restaurar padrões"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Segurança"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuração do servidor"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tipo do servidor: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Certificado de a_ssinatura:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Verificação ortográfica"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Mbox padrão do Unix"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14461,7 +14656,7 @@ msgstr ""
 "assinatura. O nome que você especificar será\n"
 "usado apenas para propósitos de exibição. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14471,7 +14666,7 @@ msgstr ""
 "correção ortográfica. A lista de línguas aqui reflete apenas as línguas para "
 "as quais você possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14479,15 +14674,15 @@ msgstr ""
 "Digite o nome pelo qual você gostaria de chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Usar _daemon"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14497,171 +14692,171 @@ msgstr ""
 "\n"
 "Pressione \"Próximo\" para começar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticação: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticação: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Verificar automaticamente novas mensagens a cada"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Inserir automaticamente imagens de _carinhas"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Soe um bip quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "C_onfirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Assinat_ura padrão:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Padrões"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Não me noti_fique quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Ativar"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Cifrar mensagens enviadas (por padrão)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Correio _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Lixo"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "C_arregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "_Testes locais apenas"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrão"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Toque um _arquivo de som quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Perguntar ao enviar mensagens HTML para contatos que não as querem"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Recebendo correio"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Restaurar padrões"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Selecionar..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Enviando correio"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Exibir imagens animadas"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "A_ssinaturas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Fonte _padrão:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Fonte de _terminal:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexão se_gura (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "descrição"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -14684,7 +14879,7 @@ msgstr ""
 "Erro ao executar operação:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Trabalhando"
 
@@ -14696,12 +14891,12 @@ msgstr "Filtrando pasta"
 msgid "Fetching Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar filtros de saída: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14710,116 +14905,116 @@ msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentando à pasta local `Enviada'."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao acrescentar à pasta local `Enviada': %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Concluída."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo repositório %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Esvaziando lixeira em '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Pastas locais"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Buscando mensagem %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Buscando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14828,7 +15023,7 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14837,11 +15032,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14850,22 +15045,22 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Alterando estado de lixo"
 
@@ -14897,38 +15092,38 @@ msgstr "Cifragem"
 msgid "Security Information"
 msgstr "Informação de segurança"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Caminho: %s, Tipo: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Receber e enviar correio"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Cancelar _todos"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Esperando..."
 
@@ -15037,20 +15232,20 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentando editar uma pasta virtual '%s' que não existe."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
@@ -15369,97 +15564,20 @@ msgstr "Pastas desconectadas"
 msgid "Autocompletion Folders"
 msgstr "Pastas autocompletar"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Não é possível copiar pasta: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Não é possível mover pasta: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Não é possível mover uma pasta sobre ela mesma."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Não é possível copiar uma pasta sobre ela mesma."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Não é possível mover uma pasta em um dos seus descendentes."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Especifique uma pasta para onde copiar a pasta \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Copiar pasta"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Especifique uma pasta para onde mover a pasta \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Mover pasta"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Não é possível excluir pasta:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Excluir mesmo pasta \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Não é possível renomear pasta:\n"
+"Não é possível criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "O nome de pasta especificado não é válido: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "A pasta selecionada não pertence a outro usuário"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Não é possível remover pasta:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Não é possível criar a pasta especificada:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sem nome)"
@@ -15599,7 +15717,7 @@ msgstr "Falhou a execução do gpg."
 msgid "_Import"
 msgstr "_Importar"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Fechando conexões..."
 
@@ -15637,6 +15755,10 @@ msgstr "Não foi possível abrir pasta compartilhada: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Não é possível localizar a pasta compartilhada especificada."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Iniciando a importação"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15754,123 +15876,6 @@ msgstr "Não foi localizado o banco de dados de configuração"
 msgid "Generic error"
 msgstr "Erro genérico"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Criar novo grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nome do grupo:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Você deseja realmente excluir o grupo \"%s\" da barra de atalhos?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Renomear grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Renomear grupo de atalhos selecionado para:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Ícones _pequenos"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Exibe os atalhos como ícones pequenos"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Ícones _grandes"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Exibe os atalhos como ícones grandes"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Adicionar group..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Criar um novo grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Remover este grupo..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Exclui este atalho da barra de atalhos"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Re_nomear este grupo..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Renomear este grupo de atalhos"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Es_conder a barra de atalhos"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Esconder a barra de atalhos"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Criar atalhos _padrão"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Criar atalhos padrão"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Renomear atalho"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Renomear atalho selecionado para:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Abrir a pasta vinculada a este atalho"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Abrir em nova _janela"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Abrir a pasta vinculada a este atalho em uma nova janela"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Renomear este atalho"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Re_mover"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Remove este atalho da barra de atalhos"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Erro ao salvar atalhos."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Atalhos"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Caixa de marcação"
@@ -15881,11 +15886,6 @@ msgstr "Caixa de marcação"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" em \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16183,45 +16183,45 @@ msgstr ""
 "%s: --online e --offline não podem ser usados juntos.\n"
 "  Use %s --help para mais informações.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Selecionar um certificado a importar..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Propósitos"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Número de série"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Válido até"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Endereço eletrônico"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificado: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Entre a senha para `%s'"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16230,7 +16230,7 @@ msgstr ""
 "Emitido para:\n"
 "     Assunto: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16295,7 +16295,7 @@ msgstr ""
 "Antes de confiar nesta AC para qualquer propósito você deve examinar o seu "
 "certificado e as suas políticas e procedimentos (se disponíveis)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -16360,11 +16360,11 @@ msgstr "Unidade organizacional (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Impressão digital SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "Certificado do cliente SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "Certificado do servidor SSL"
 
@@ -16411,209 +16411,209 @@ msgstr "Você possui certificados em arquivo que identificam estas pessoas:"
 msgid "Your Certificates"
 msgstr "Seus certificados"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "O certificado já existe"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Versão"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Versão 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Versão 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 com cifragem RSA"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 com cifragem RSA"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 com cifragem RSA"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifragem RSA"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Uso chave do certificado"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade certificadora"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do objeto (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Parâmetros do algoritmo"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr "Informação da chave pública do sujeito"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pública do sujeito"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Chave pública do sujeito"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Erro: Não é possível processar extensão"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Autor da assinatura do objeto"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "Autoridade certificadora SSL"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Autoridade certificadora de e-mail"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr "Assinando"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr "Não repúdio"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr "Cifragem da chave"
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr "Cifragem dos dados"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr "Acordo de chave"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Autor da assinatura do certificado"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "Autor da assinatura CRL"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Crítico"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Não crítico"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Extensões"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo da assinatura do certificado"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Emissor"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr "ID único do emissor"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "ID único do sujeito"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Valor da assinatura do certificado"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Senha de arquivo PKCS12"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Entre senha para arquivo PKCS12:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -17204,7 +17204,8 @@ msgid "_Threaded Message List"
 msgstr "Lista de mensagens _encadeadas"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "A_dicionar remetente ao catálogo de endereços"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17212,7 +17213,8 @@ msgid "A_pply Filters"
 msgstr "A_plicar filtros"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Adicionar remetente ao catálogo de endereços"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17657,10 +17659,6 @@ msgstr "For_mato"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Abrir um arquivo"
@@ -18024,22 +18022,6 @@ msgstr "_Enviar / receber"
 msgid "_Window"
 msgstr "_Janela"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Imprimir resumo"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Imprimir resumo"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Recarregar"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Recarregar a visão"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _empresa"
@@ -18100,8 +18082,8 @@ msgstr "Com _categoria"
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18345,23 +18327,23 @@ msgstr "_Pesquisar"
 msgid "_Find Now"
 msgstr "_Localizar agora"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID do item"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID do sub-item"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Texto"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Localizar a_gora"
 
@@ -18375,6 +18357,220 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Fontes do catálogo de endereços"
+
+#~ msgid "No data provided"
+#~ msgstr "Não foram fornecidos dados"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível abrir arquivo `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível criar diretório `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível criar arquivo `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' não é um diretório."
+
+#~ msgid "On this Computer"
+#~ msgstr "Neste computador"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Verificar se mensagens recebidas são lixo para contas IMAP"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Executar teste de lixo nas mensagens recebidas para contas IMAP (válido "
+#~ "apenas se \"check_incoming\" for \"true\")"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importando %s como %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Varrendo filtros de correio"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Varrendo diretório"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "_Não verifique mensagens recebidas para contas IMAP"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Não é possível copiar pasta: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Não é possível mover pasta: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Não é possível mover uma pasta sobre ela mesma."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Não é possível copiar uma pasta sobre ela mesma."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Não é possível mover uma pasta em um dos seus descendentes."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Especifique uma pasta para onde copiar a pasta \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Copiar pasta"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Especifique uma pasta para onde mover a pasta \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Mover pasta"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não é possível excluir pasta:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Excluir mesmo pasta \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não é possível renomear pasta:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "A pasta selecionada não pertence a outro usuário"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não é possível remover pasta:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Criar novo grupo de atalhos"
+
+#~ msgid "Group name:"
+#~ msgstr "Nome do grupo:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Você deseja realmente excluir o grupo \"%s\" da barra de atalhos?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Renomear grupo de atalhos"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Renomear grupo de atalhos selecionado para:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Ícones _pequenos"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Exibe os atalhos como ícones pequenos"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Ícones _grandes"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Exibe os atalhos como ícones grandes"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Adicionar group..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Criar um novo grupo de atalhos"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Remover este grupo..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Exclui este atalho da barra de atalhos"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Re_nomear este grupo..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Renomear este grupo de atalhos"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Es_conder a barra de atalhos"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Esconder a barra de atalhos"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Criar atalhos _padrão"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Criar atalhos padrão"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Renomear atalho"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Renomear atalho selecionado para:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Abrir a pasta vinculada a este atalho"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Abrir em nova _janela"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Abrir a pasta vinculada a este atalho em uma nova janela"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Renomear este atalho"
+
+#~ msgid "Re_move"
+#~ msgstr "Re_mover"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Remove este atalho da barra de atalhos"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Erro ao salvar atalhos."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Atalhos"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" em \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Imprimir resumo"
+
+#~ msgid "Print summary"
+#~ msgstr "Imprimir resumo"
+
+#~ msgid "Reload"
+#~ msgstr "Recarregar"
+
+#~ msgid "Reload the view"
+#~ msgstr "Recarregar a visão"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Copiar para pasta..."
 
diff --git a/po/ro.po b/po/ro.po
index 57a6d98dcb..840745f2b2 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -52,8 +52,7 @@ msgstr "Crează sau editează conturile de mail şi alte preferinţe"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Contacte"
 
@@ -101,20 +100,20 @@ msgstr "Procesator pentru componenta de mail Evolution."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Agendă"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -122,46 +121,46 @@ msgstr "Agendă"
 msgid "Delete"
 msgstr "Şterg"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 #, fuzzy
 msgid "Properties..."
 msgstr "_Proprietăţi..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crează contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Listă contacte nouă"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Crează listă nouă de contacte"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Nu mă pot conecta la serverul LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -169,33 +168,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 #, 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Eroare la încarcarea informaţiei de filtrare:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 #, 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Aştept..."
@@ -209,42 +208,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Trimit \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data terminare"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -252,7 +253,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -260,19 +261,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -281,7 +282,7 @@ msgstr ""
 "Nu pot deschide această agendă. Vă rog verificaţi dacă există calea\n"
 "şi daca aveţi drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -291,7 +292,7 @@ msgstr ""
 "că aţi introdus URI incorect, sau serverul LDAP\n"
 "e căzut"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -303,7 +304,7 @@ msgstr ""
 "programul din sursele CVS după ce descărcaţi OpenLDAP urmând\n"
 "legătura următoare.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -313,15 +314,15 @@ msgstr ""
 "că aţi introdus URI incorect, sau serverul LDAP\n"
 "e căzut"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -329,16 +330,21 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduceţi parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI afişat de calendar"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI afişat de calendar"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -383,7 +389,7 @@ msgstr "Verific tipurile suportate"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -417,20 +423,21 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Surse agendă"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Surse agendă"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Surse agendă"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Surse _agendă..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always"
 msgstr "Alarme"
@@ -442,61 +449,62 @@ msgstr "Anonim"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Connecting"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nume listă:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "Găseşte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Nume grup:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -506,33 +514,33 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Unu"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Scopul căutării:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "Searching"
 msgstr "Caut..."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Şterse"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -543,7 +551,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -552,7 +560,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -560,43 +568,44 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Informaţie sursă"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Conectare la server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Conectare la server..."
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
 msgid "Sub"
 msgstr "Du"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -605,7 +614,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -613,7 +622,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -623,50 +632,51 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -674,29 +684,29 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -704,20 +714,20 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "Afişează"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -726,46 +736,46 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Editează"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Port number:"
 msgstr "Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Search base:"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durata de sforăire (minute)"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "searching-tab"
 msgstr "Caut..."
@@ -897,7 +907,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
@@ -996,10 +1006,10 @@ msgstr "Ca_tegorii..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1053,16 +1063,16 @@ msgid "_Web page address:"
 msgstr "Adresa paginii de web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "_Adresa:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2129,74 +2139,82 @@ msgid "AOL Instant Messenger"
 msgstr "Tipăreşte mesaj"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Mesaj _mail"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Adaug serviciu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "_Acţiune"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Nume utilizator:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Adresa de acasă"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "Lucrez"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Alte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Sursă"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2204,96 +2222,101 @@ msgstr ""
 msgid "Contact"
 msgstr "Contacte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Câmpul De la"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Scaun"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Nume cont"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Nu e disponibilă o descriere."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Această persoană de contact aparţine categoriilor:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Salvează ca şi card V"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #, 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/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 #, 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.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Serviciu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Port:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Nume grup:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Adăugare-Rapidă"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Editare completă"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nume complet:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2463,11 +2486,11 @@ msgid "Is New List"
 msgstr "Listă nouă"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Salvează ca şi card V"
@@ -2564,14 +2587,14 @@ msgid "Email begins with"
 msgstr "se termină cu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Orice câmp conţine"
 
@@ -2588,110 +2611,110 @@ msgid "Type"
 msgstr "Tip"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvează ca şi card V"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 #, fuzzy
 msgid "New Contact..."
 msgstr "Contact nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Listă contacte nouă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 #, fuzzy
 msgid "Import..."
 msgstr "_Importă..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Caută contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Surse _agendă..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Setări _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Înaintează _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tipăreşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Tipăreşte plic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Decupează"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Copiază"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Lipeşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curentă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2700,8 +2723,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
@@ -2745,7 +2768,7 @@ msgid "Company Phone"
 msgstr "Telefon companie"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2807,7 +2830,7 @@ msgid "Nickname"
 msgstr "Poreclă"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Notă"
 
@@ -2816,7 +2839,7 @@ msgid "Office"
 msgstr "Birou"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizaţie"
 
@@ -2955,68 +2978,74 @@ msgstr "Şterse"
 msgid "Has Cursor"
 msgstr "Sortare sarcini"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Membri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Lucrez"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Jos:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Nume grup:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Inexistent"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "General"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "întotdeauna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Funcţia:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax acasă"
@@ -3026,8 +3055,8 @@ msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3059,7 +3088,7 @@ msgstr "Protocol nesuportat"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3082,7 +3111,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
-msgid "Addressbook does not exist"
+msgid "Address Book does not exist"
 msgstr "Dosarul `%s' nu există."
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3224,7 +3253,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Adaugă adresa la contactul existent \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Căutare agendă..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3284,19 +3314,42 @@ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Utilitar de import Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Tipăreşte contactele selectate"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Tipăreşte contactele selectate"
@@ -3390,7 +3443,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Număr de coloane"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opţiuni"
 
@@ -3579,8 +3632,8 @@ msgstr "Nici un destinatar specificat"
 msgid "Unnamed List"
 msgstr "Contact schimbat:"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Introduceţi parola pentru %s"
@@ -3669,10 +3722,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Sarcini"
 
@@ -3720,26 +3772,24 @@ msgstr "Durata de sforăire (minute)"
 msgid "_Edit appointment"
 msgstr "_Editează întălnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
 msgstr "Deschide"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Nu e disponibilă o descriere."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3748,12 +3798,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Avertisment"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3761,7 +3811,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3772,20 +3822,20 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Nu mă întreba din nou"
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot iniţializa Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Nu pot iniţializa gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarmă"
 
@@ -3931,24 +3981,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Arată numărul de săptămâni"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Rezumatul conţine"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrierea conţine"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentariul conţine"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Descrierea conţine"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -3977,7 +4033,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4001,81 +4057,81 @@ msgstr "%A, %d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Contact nou"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 #, fuzzy
 msgid "New appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 #, fuzzy
 msgid "_Appointment"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Crează o întîlnire nouă"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 #, fuzzy
 msgid "New meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Aceasta e o cerere de întâlnire."
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crează o întîlnire nouă"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Contact nou"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Crează un calendar nou"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4215,7 +4271,7 @@ msgstr "ore"
 msgid "minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4290,7 +4346,7 @@ msgid "hour(s)"
 msgstr "ora"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -4301,7 +4357,7 @@ msgstr "început întâlnire"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 #, fuzzy
 msgid "Enabled"
 msgstr "Validează"
@@ -4354,7 +4410,7 @@ msgstr "30 minute"
 msgid "60 minutes"
 msgstr "60 minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alerts"
 msgstr "Alarme"
@@ -4382,7 +4438,7 @@ msgid "Days"
 msgstr "Zi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "E_nable"
 msgstr "Validează"
@@ -4539,7 +4595,7 @@ msgid "_Fri"
 msgstr "Vin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4642,7 +4698,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de sarcini"
@@ -4794,23 +4850,23 @@ msgstr "%s Nu aţi făcut modificări, actualizaţi editorul?"
 msgid "Validation error: %s"
 msgstr "Eroare necunoscută: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " la "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Terminat "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr ""
 
@@ -4847,8 +4903,8 @@ msgstr "Intrare jurnal - %s"
 msgid "No summary"
 msgstr "Nu există rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Salvează ca..."
 
@@ -4877,11 +4933,21 @@ msgstr "Anulare operaţie"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Calendar"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Lista de sarcini"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4988,7 +5054,7 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "Şterse"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Întâlnire"
 
@@ -5013,25 +5079,33 @@ msgstr "Progra_mare întâlniri"
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data început"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Ora de început"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Acces interzis"
@@ -5115,30 +5189,30 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Inexistent"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
@@ -5341,7 +5415,7 @@ msgstr "în"
 msgid "occurrences"
 msgstr "apariţii"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Ora"
@@ -5380,7 +5454,7 @@ msgid "_No recurrence"
 msgstr "Nici o revenire"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Şte_rge"
 
@@ -5423,7 +5497,7 @@ msgstr ""
 "Această semnătură a fost modificată, dar n-a fost salvată.\n"
 "Doriţi să salvaţi modificările?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5456,7 +5530,7 @@ msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Informaţiile despre sarcină au fost schimbate. Trimit o versiune actualizată?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Terminat "
@@ -5470,7 +5544,7 @@ msgstr "% Terminat"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Terminat"
 
@@ -5483,7 +5557,7 @@ msgstr "Ridicat"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "În derulare"
 
@@ -5502,7 +5576,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nepornit"
 
@@ -5545,16 +5619,16 @@ msgstr "De bază"
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nu pot deschide agenda"
@@ -5566,7 +5640,7 @@ msgstr "Confidenţial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -5761,11 +5835,10 @@ msgstr "Data început"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Rezumat"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr " culoare"
@@ -5793,7 +5866,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5828,10 +5901,10 @@ msgstr "Nu"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Necunoscut"
@@ -5844,109 +5917,115 @@ msgstr ""
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "întâlnire nouă..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 #, fuzzy
 msgid "New Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Tipăreşte..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Lipeşte"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Aceasta e informaţie liber-ocupat."
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "Deschide"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Salvează ca..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Copiază"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Şterge această apariţie"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Şterge toate apariţiile"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "Setări _mail..."
@@ -6042,7 +6121,7 @@ msgid "Alarms"
 msgstr "Alarme"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Terminat"
 
@@ -6100,26 +6179,26 @@ msgstr "%02i diviziuni minute"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6322,7 +6401,7 @@ msgid "Send Latest Information"
 msgstr "Informaţie"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Renunţă"
@@ -6816,12 +6895,12 @@ msgstr "_Prioritate:"
 msgid "Web Page:"
 msgstr "Pagină"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Clic aici să adăugaţi o sarcină"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6829,7 +6908,7 @@ msgid ""
 msgstr "Eroare la start %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6837,44 +6916,54 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Deschid rezerva %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Eroare la start %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Încarcă _imaginile"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Nu există întâlniri"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Deschide în %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -7002,16 +7091,16 @@ msgstr "Informaţie sursă"
 msgid "iCalendar information"
 msgstr "informaţie calendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7019,7 +7108,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7027,12 +7116,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7224,53 +7313,53 @@ msgstr "Luna curentă (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 #, fuzzy
 msgid "Task"
 msgstr "Sarcină"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Stare"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritate:"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Întâlnire încheiată:"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
 "\n"
 "Categorii:  "
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 #, fuzzy
 msgid "Contacts: "
 msgstr "Contacte"
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Previzualizează tipărirea"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Tipăreşte elementul"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Setează tipărirea"
 
@@ -7279,40 +7368,40 @@ msgstr "Setează tipărirea"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 #, fuzzy
 msgid "New task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "Sarcină"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Crează o sarcină nouă"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Crează o sarcină nouă"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7371,22 +7460,22 @@ msgstr "Mesaj calendar"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Întâlnire - %s"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Reaminteşte"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mesaj calendar"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7395,7 +7484,7 @@ msgstr ""
 "Evolution a găsit fişiere de mail Pine.\n"
 "Doriţi să le importaţi în Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Deschide calendar"
@@ -9092,7 +9181,7 @@ msgstr "Nu pot deschide mesajul"
 msgid "Failed on message %d"
 msgstr "Eşuare la mesajul %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
@@ -9187,7 +9276,7 @@ msgstr "Copiez mesajele în %s"
 msgid "Filtering new message(s)"
 msgstr "Primesc mesaje"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9195,47 +9284,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:814
-#, fuzzy
-msgid "No data provided"
-msgstr "Nici un destinatar specificat"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9243,61 +9327,61 @@ msgid ""
 "%s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nu pot crea fişier temp: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mesaj criptat"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nu pot primi mesajul de la editor"
@@ -9410,22 +9494,35 @@ msgstr ""
 msgid "parse error"
 msgstr "Altă eroare"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Furnizor de email în dosar virtual"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nu pot încărca %s: Încărcarea modulului nu e suportată în acest sistem."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nu pot încărca %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nu pot încărca %s: Nu există cod de iniţializare în modul"
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Nici un furnizor valid pentru protocolul `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonim"
@@ -9576,7 +9673,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Răspuns de la server de autentificare eşuată."
 
@@ -9718,20 +9815,7 @@ msgstr "Eşec la căutarea gazdei: %s: gazdă negăsită"
 msgid "Host lookup failed: unknown reason"
 msgstr "Eşec la căutarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Furnizor de email în dosar virtual"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Pentru citirea mailului ca o interogare a altui set de dosar"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Nici un furnizor valid pentru protocolul `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9802,22 +9886,26 @@ msgstr "Server: %s, Tip: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/camel-store.c:297
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Gunoi"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -10048,21 +10136,31 @@ msgstr "Nu există mesajul %s în %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Nu puteţi copia mesaje din acest dosar"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -10079,16 +10177,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Aplică filtrele pe mesajele noi din INBOX pe acest server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Agendă"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -10108,70 +10201,67 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Parola"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Această opţiune vă va conecta la serverul IMAP folosind o parolă în clar "
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
+#: camel/providers/groupwise/camel-gw-listener.c:323
 #, fuzzy
-msgid "Default"
-msgstr "Implicit"
+msgid "Checklist"
+msgstr "Ceaţă densă"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operaţia anulată"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat neaşteptat"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Răspunsul serverului terminat prea repede."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Răspunsul serverului IMAP neaşteptat OK: %s"
@@ -10186,7 +10276,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Dosarul a fost distrus şi recreat pe server."
 
@@ -10196,12 +10286,12 @@ msgstr "Dosarul a fost distrus şi recreat pe server."
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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 +10307,25 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil în mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot găsi corpul mesajului în răspunsul FETCH."
 
@@ -10293,28 +10383,38 @@ msgstr "Nume spaţiu"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplică filtrele pe mesajele noi din INBOX pe acest server"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Verific mesajele noi în toate dosarele"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Verific mesajele noi în toate dosarele"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 #, fuzzy
 msgid "IMAP"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s serviciu pentru %s în %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10323,68 +10423,68 @@ msgstr "%s serviciu pentru %s în %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Nu aţi introdus o parolă."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10395,24 +10495,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu există dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Eroare necunoscută: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10434,7 +10542,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nu mă pot conecta la serverul POP în %s."
@@ -10521,8 +10629,8 @@ msgid ""
 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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10534,55 +10642,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Stocările locale nu au un inbox"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fişier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nu pot şterge dosarul sumar al fişierelor `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nu pot încărca sumarul pentru %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nu pot adăuga mesajul la sumar: motiv necunoscut"
 
@@ -10601,53 +10709,44 @@ msgstr "Nu pot adăuga mesajul la dosarul maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Conţinut invalid al mesajului"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nu pot deschide dosarul `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Dosarul `%s' nu există."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nu pot crea dosarul `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' nu e un director de tip maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot şterge dosarul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10671,9 +10770,9 @@ msgid "Checking for new messages"
 msgstr "Salvez mesajele"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
@@ -10719,109 +10818,87 @@ msgstr "Dosarul pare a fi deteriorat irecuperabil."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Construcţia mesajului eşuată: căsuţa poştală coruptă?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nu pot deschide fişierul `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nu pot crea directorul %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Acesta nu este un fişier normal."
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nu pot crea fişierul `%s':\n"
+"Nu pot şterge dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nu e un fişier obişnuit."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Dosarul `%s' nu e gol. Nu s-a şters."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID-ul card-ului există deja"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Numele dosarului specificat este invalid."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nu pot redenumi dosarul %s în %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Nu pot deschide dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Eroare fatală la parserul de mail la poziţia %ld în dosarul %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -10829,53 +10906,53 @@ msgstr ""
 "Nu pot deschide fişierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nu pot deschide căsuţa poştală temporară: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nu pot închide dosarul sursă %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot închide dosarul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sumarul şi dosarul nu se potrivesc, chiar după o sincronizare"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscută: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Eroare la scrierea în căsuţa poştală temporară: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Eşec la scrierea în căsuţa poştală: %s: %s"
@@ -10890,10 +10967,17 @@ msgstr "Trimite mesaj la contact"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nu pot adăuga mesajul la dosarul mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nu pot crea dosarul `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' nu e un director"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Nu pot lua dosarul: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10915,6 +10999,29 @@ msgstr "Stocarea root %s nu e director obişnuit"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Dosarul `%s'/%s nu există."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nu pot deschide dosarul `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Dosarul `%s' nu există."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nu pot crea dosarul `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
@@ -11152,48 +11259,48 @@ msgstr "Nu pot redenumi dosarul %s în %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nu pot muta un dosar într-unul din descendenţii săi/"
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Eroare necunoscută: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "Nu există dosarul %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "Nu pot crea conexiunea: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nu pot aduce mesajul: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "Eroare necunoscută: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 #, fuzzy
 msgid "Use cancel"
 msgstr "Renunţă"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Operaţia anulată"
@@ -11242,7 +11349,7 @@ msgstr "Ştergere după %s zi(le)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11334,7 +11441,7 @@ msgid "No such folder `%s'."
 msgstr "Nu există dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11389,7 +11496,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11563,7 +11670,7 @@ msgstr "SMTP mail livrat prin %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalidă."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
@@ -11678,34 +11785,34 @@ msgstr "Comanda AUTH a expirat: %s"
 msgid "QUIT response error"
 msgstr "Răspuns de eroare RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "anexă"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Adaugă anexă..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Anexează un fişier la mesaj"
 
@@ -11830,19 +11937,19 @@ msgstr "<clic aici să alegeţi un dosar>"
 msgid "Attach file(s)"
 msgstr "Anexează un fisier"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11851,30 +11958,30 @@ msgstr ""
 "Eroare la citirea fişierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fişierul există, suprascriu?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fişierului: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la încărcarea fişierului: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fişierului: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11883,7 +11990,7 @@ msgstr ""
 "Nu pot căuta în fişierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11892,7 +11999,7 @@ msgstr ""
 "Nu pot trunchia fişierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11901,7 +12008,7 @@ msgstr ""
 "Nu pot căuta în fişierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11910,7 +12017,7 @@ msgstr ""
 "Eroare la salvarea automată a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11919,7 +12026,7 @@ msgstr ""
 "Evolution a găsit fişiere nesalvate într-o sesiune anterioară.\n"
 "Doriţi să încerc o restaurare?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11929,51 +12036,51 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Doriţi să salvaţi modificările?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje înaintate"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Deschide fişier"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Salvează semnătura"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11984,7 +12091,7 @@ 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:3201
+#: composer/e-msg-composer.c:3216
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11993,7 +12100,7 @@ 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:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12362,7 +12469,7 @@ msgstr "Atunci"
 msgid "You must specify a folder."
 msgstr "Nume stil:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Alege dosar"
@@ -12377,20 +12484,20 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Important"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
 msgstr "La"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
 msgstr "după"
@@ -12485,7 +12592,7 @@ msgstr ""
 "Data mesajului va fi comparată indiferent\n"
 "de ora specificată aici."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Dosare virtuale"
 
@@ -12501,7 +12608,7 @@ msgstr ""
 msgid "months"
 msgstr "luni"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "secunde"
 
@@ -12679,7 +12786,7 @@ msgstr "Marcat"
 msgid "Junk Test"
 msgstr "Iunie"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12794,9 +12901,10 @@ msgstr "începe cu"
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Subiect"
 
@@ -12805,25 +12913,25 @@ msgstr "Subiect"
 msgid "Unset Status"
 msgstr "Setează starea"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Reguli"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Adaugă reguli"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Editez reguli"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Nume regulă:"
@@ -12872,16 +12980,16 @@ msgstr "Numele conţine"
 msgid "Subject does not contain"
 msgstr "nu conţine"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Schimbă numele acestui dosar"
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "Surse dosare V"
@@ -12940,9 +13048,9 @@ msgstr "Componenta Evolution pentru afişarea mailului."
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Mail"
 
@@ -12951,7 +13059,7 @@ msgstr "Mail"
 msgid "Mail Accounts"
 msgstr "Conturi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferinţe calendar"
@@ -12995,17 +13103,17 @@ msgstr "Nume stil:"
 msgid "[script]"
 msgstr "Descriere:"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Limbaj"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 #, fuzzy
 msgid "Add script signature"
 msgstr "Adaugă criteriu"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Semnătură HTML:"
@@ -13093,7 +13201,6 @@ msgid "Unread messages"
 msgstr "Trimite şi mesajele ciornă"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<clic aici să alegeţi un dosar>"
 
@@ -13102,410 +13209,428 @@ msgstr "<clic aici să alegeţi un dosar>"
 msgid "Create New Folder"
 msgstr "Creză dosar nou..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nume dosar:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Dosare V"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Încarc..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, fuzzy, c-format
 msgid "%s"
 msgstr "s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Creez un dosar nou"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nu pot şterge dosarul `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Şterge dosarul '%s'"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Şterg"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: mail/em-folder-tree.c:2153
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Deschide în fereastră nouă"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Mută"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Dosar _nou"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenumeşte"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Proprietăţi..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Editează ca mesaj nou..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "Ti_păreşte"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Răspunde la _listă"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Răspunde la toţi"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Înaintează"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Şterge"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Marchează ca citit"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_uperează"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut în folderul..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiază în dosarul..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaugă expeditorul în agendă"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplică filtre"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crează regulă din mesaj"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V în lista de mail"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder în expeditor"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtru pe expeditor"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default"
+msgstr "Implicit"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Tipăreşte mesaj"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiază legătura către locaţia"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Clic aici să adăugaţi o sarcină"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Potriviri:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Alocat"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Adaugă criteriu"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Adaugă criteriu"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Nedefinit"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Mesaj criptat"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Criptare PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Mesaj criptat"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID certificat:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Mesajul nu este disponibil în mod curent"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "Termen depăşit"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vedere inline"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Ascund"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Primesc mesajul %d din %d"
@@ -13549,30 +13674,35 @@ msgstr "Indicator către o dată externă necunoscută (tip \"%s\")"
 msgid "Formatting message"
 msgstr "Copiez mesaje"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "De la"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13589,8 +13719,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13608,21 +13738,26 @@ msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Operaţie anulată de utilizator."
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Eşec la verificarea certificatului."
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Eşec la verificarea certificatului."
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13634,61 +13769,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "(Mesaj fără titlu)"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fundal:"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Deschide legătura în navigator"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Trimite _mesaj către lista..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adăugare agendă"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide în %s..."
@@ -13739,18 +13874,18 @@ msgstr "_Filtre..."
 msgid "-------- Forwarded Message --------"
 msgstr "Mesaje înaintate"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 #, 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13759,7 +13894,7 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13768,32 +13903,38 @@ msgstr ""
 "Fişier al cărui nume există deja.\n"
 "Îl suprascrieţi?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Mesaj"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Fişierul spool `%s' nu există sau nu e un fişier obişnuit."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Salvează mesajul ca..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "_Adresa:"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mail de la %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nu pot crea directorul temporar: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13802,7 +13943,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13825,317 +13966,325 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Decupează mesajele selectate"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Decupează mesajele selectate"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Caută textul în corpul mesajului afişat"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Caută textul în corpul mesajului afişat"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Stilul implicit pentru \"Înaintează\" este: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Decupează mesajele selectate"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Decupează mesajele selectate"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Stilul implicit pentru \"Înaintează\" este: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Comută în timp ce se arată bara folder"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Comută în timp ce se arată bara folder"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Trimite mesajul mai târziu"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Conturi"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Execută acţiunile"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configurare mail"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configurare mail"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Trimite implicit mail în format HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Trimite implicit mail în format HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Ploaie torenţială"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Ploaie torenţială"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Arată mesajul într-un stil normal"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Arată fereastra de previzualizare mesaje"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Contact original:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -14143,182 +14292,177 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Listă de mesaje înlănţuite"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Listă de mesaje înlănţuite"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Mesaj înaintat (fără subiect)"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Fă contul acesta contul meu implicit"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Variabil"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 #, fuzzy
 msgid "Evolution is importing your old Elm mail"
 msgstr "Componentă Evolution pentru manipularea mailului."
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 #, fuzzy
 msgid "Importing..."
 msgstr "Se importă"
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 #, fuzzy
 msgid "Please wait"
 msgstr "se termină cu"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, fuzzy, c-format
-msgid "Importing %s as %s"
-msgstr ""
-"Se importă %s.\n"
-"Start %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, fuzzy, c-format
-msgid "Scanning %s"
-msgstr "Trimit \"%s\""
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Se importă"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -14326,16 +14470,44 @@ msgstr ""
 "Evolution a găsit fişiere de mail Elm.\n"
 "Doriţi să le importaţi în Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Şterge acest dosar"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Se importă"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Se importă"
+
+#: mail/importers/mail-importer.c:354
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Trimit \"%s\""
+
+#: mail/importers/netscape-importer.c:72
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "_Prioritate:"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14350,7 +14522,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14358,7 +14530,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14367,35 +14539,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-#, fuzzy
-msgid "Scanning mail filters"
-msgstr "Fişier mail-uri locale %s"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-#, fuzzy
-msgid "Scanning directory"
-msgstr "Scanez dosarul IMAP"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
+#: mail/importers/netscape-importer.c:1677
 #, fuzzy
-msgid "Starting import"
-msgstr "_Data început:"
+msgid "Importing Netscape data"
+msgstr "Se importă"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Setări"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editează filtre"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14403,11 +14565,20 @@ msgstr ""
 "Evolution a găsit fişiere de mail Netscape.\n"
 "Doriţi să le importaţi în Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Se importă"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Agendă"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14415,7 +14586,7 @@ msgstr ""
 "Evolution a găsit fişiere de mail Pine.\n"
 "Doriţi să le importaţi în Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 #, fuzzy
 msgid "Pine"
 msgstr "Tipăreşte"
@@ -14460,21 +14631,21 @@ msgid "You have not filled in all of the required information."
 msgstr "Nu aţi completat toată informaţia cerută."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazdă:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
@@ -14524,30 +14695,45 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compune un mesaj"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Dosar V Nou"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Editează filtre"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Creez un mail nou"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI afişat de calendar"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitate"
 
@@ -14596,7 +14782,7 @@ msgstr ""
 "Dacă nu ştiţi ce protocol folosiţi, contactaţi administratorul dumneavostră "
 "de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Management cont"
 
@@ -14624,132 +14810,128 @@ msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid " _Check for supported types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Semnarea e nesuportată de acest cifru"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportată de acest cifru"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informaţie cont"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "Adaugă criteriu"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Salvează semnătura"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexează un fişier la mesaj"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexă"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Set de caractere necunoscut: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Închide"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Culoare pentru sarcinile de astăzi"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Compune un mesaj"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14767,346 +14949,342 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva setările"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email-ul conţine"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Execută acţiunile"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se termină cu"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Opţiuni"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Proprietăţi"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Antet"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Iluminează citatele cu "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "În linie"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Salvează şi închide"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Încarcă _imaginile"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Locaţie căsuţă poştală"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Antet mesaj"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Afişează mesaj"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Numele conţine"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informaţie opţională"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaţie:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tipăreşte contactele selectate"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Răspunde la:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opţiuni primire"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informaţie cerută"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Trimite şi mesajele ciornă"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesită _autentificare"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15117,204 +15295,204 @@ msgstr ""
 "\n"
 "Clic \"Următorul\" pentru a începe"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "Întotdeauna încarcă imaginile neconectat"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Validează"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Înaintează ca"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "În mailuri HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Iunie"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Încarcă imaginile dacă expeditorul e în agendă"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Fă contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marchează mesajele ca \"Citit\" după"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu încărca niciodată imaginile neconectat"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Răspunde la toţi"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Şterge..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ploaie torenţială"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Contact original:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Foloseşte conectare securizată (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
@@ -15337,7 +15515,7 @@ msgstr ""
 "Eroare în timpul operaţiei:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Lucrez"
 
@@ -15351,131 +15529,131 @@ msgstr "Actualizez dosarul"
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Eşec la mesajul %d din %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Salvez mesaj în dosar"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 "Se importă %s.\n"
 "Start %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15484,7 +15662,7 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15493,11 +15671,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15506,22 +15684,22 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15556,40 +15734,40 @@ msgstr "Excepţii"
 msgid "Security Information"
 msgstr "Informaţie sursă"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Renunţ..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Tip: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Trimite & Primeşte mailul"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Renunţă"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Aştept..."
 
@@ -15700,22 +15878,22 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editează dosare V"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
@@ -16063,101 +16241,20 @@ msgstr "Dosare speciale"
 msgid "Autocompletion Folders"
 msgstr "Data terminare"
 
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Nu pot muta un dosar peste el însuşi."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Nu copia un dosar peste el însuşi."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Nu pot muta un dosar într-unul din descendenţii săi/"
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Precizaţi un dosar pentru a copia dosarul \"%s\" în:"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Copiază dosarul"
-
-#: shell/e-shell-folder-commands.c:363
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Precizaţi un dosar pentru a muta dosarul \"%s\" în:"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Mută dosarul"
-
-#: shell/e-shell-folder-commands.c:391
-#, fuzzy, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Şterge dosarul '%s'"
-
-#: shell/e-shell-folder-commands.c:489
-#, fuzzy, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Nu pot şterge dosarul `%s':\n"
+"Nu pot crea dosarulul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Numele dosarului specificat este invalid."
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Nu pot crea dosarulul precizat:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Fără titlu)"
@@ -16296,7 +16393,7 @@ msgstr "Eşec la decodarea mesajului."
 msgid "_Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Închid conexiunile..."
 
@@ -16340,6 +16437,11 @@ msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
 
+#: shell/e-shell-startup-wizard.c:569
+#, fuzzy
+msgid "Starting import"
+msgstr "_Data început:"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16459,131 +16561,6 @@ msgstr ""
 msgid "Generic error"
 msgstr "Eroare generică"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Crează un grup nou de scurtături."
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Nume grup:"
-
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Chiar doriţi să înlăturaţi grupul\n"
-"`%s' din bara de scurtături?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Redenumeşte grupul de scurtături"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Redenumeşte grupul de scurtături selectat în:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Iconuri mici"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Arată scurtăturile ca iconuri mici"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Iconuri mari"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Arată scurtăturile ca iconuri mari"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "Grup _Nou..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Crează un grup nou de scurtături"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Înlătură acest g_rup..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Înlătură acest grup de scurtături"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Rede_numeşte acest grup..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Redenumeşte acest grup de scurtături"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Ascunde bara de scurtături"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Ascunde bara de scurtături"
-
-#: shell/e-shortcuts-view.c:288
-#, fuzzy
-msgid "Create _Default Shortcuts"
-msgstr "Crează o scurtătură nouă"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "Create Default Shortcuts"
-msgstr "Crează o scurtătură nouă"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Redenumeşte scurtătura"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Redenumeşte scurtătura selectată în:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Deschide dosarul legat la această scurtătură."
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Deschide în fereastră noua"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Deschide dosarul legat la această scurtătură într-o fereastră nouă"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Redenumeşte această scurtătură"
-
-#: shell/e-shortcuts-view.c:429
-#, fuzzy
-msgid "Re_move"
-msgstr "Şterge"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Înlătură această scurtătură din bara de scurtături"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Eroare la salvarea scurtăturilor."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Scurtături"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -16595,11 +16572,6 @@ msgstr "Chinez"
 msgid "New"
 msgstr "Nou"
 
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Deschide în %s..."
-
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -16897,50 +16869,50 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Alege dosar"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID certificat:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "În desfăşurare"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Expresie"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Adresa email:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ID certificat:"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduceţi parola pentru %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
@@ -16949,7 +16921,7 @@ msgstr ""
 "Publicist: %s\n"
 "Subiect: %s"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -17018,7 +16990,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "ID certificat:"
@@ -17093,11 +17065,11 @@ msgstr "Organizaţie"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -17145,242 +17117,242 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID-ul card-ului există deja"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr ", "
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Cheia publică:"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Subiectul este %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nu pot procesa dosarul spool"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Eşec la verificarea certificatului."
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Setări"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nici o informaţie"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "anexă"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Tradiţional"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Expresie"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s server %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Fişier semnătură:"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Inserează"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Subiectul este %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Fişier semnătură:"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduceţi parola pentru %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "ID certificat:"
@@ -18021,7 +17993,7 @@ msgstr "Listă de mesaje înlănţuite"
 
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "A_dd Sender to Addressbook"
+msgid "A_dd Sender to Address Book"
 msgstr "Adaugă expeditorul în agendă"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -18031,7 +18003,7 @@ msgstr "Aplică filtre"
 
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
-msgid "Add Sender to Addressbook"
+msgid "Add Sender to Address Book"
 msgstr "Adaugă expeditorul în agendă"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18513,10 +18485,6 @@ msgstr "Format"
 msgid "HT_ML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Deschide"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Deschide fişier"
@@ -18905,24 +18873,6 @@ msgstr "Trimite / Primeşte"
 msgid "_Window"
 msgstr "Legătura DN:"
 
-#: ui/my-evolution.xml.h:2
-#, fuzzy
-msgid "Print Summary"
-msgstr "Rezumat"
-
-#: ui/my-evolution.xml.h:3
-#, fuzzy
-msgid "Print summary"
-msgstr "Sumar mail"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Reîncarcă"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -18997,8 +18947,8 @@ msgstr "Cu categorie"
 msgid "_Tasks"
 msgstr "Sarcină"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr ""
 
@@ -19255,26 +19205,26 @@ msgstr "_Caută"
 msgid "_Find Now"
 msgstr "Legătura DN:"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Şterge"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Item ID"
 msgstr "Art_icol (FIXME)"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 #, fuzzy
 msgid "Text"
 msgstr "Test"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Legătura DN:"
@@ -19289,6 +19239,224 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Surse agendă"
+
+#, fuzzy
+#~ msgid "No data provided"
+#~ msgstr "Nici un destinatar specificat"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot deschide fişierul `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot crea directorul %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot crea fişierul `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' nu e un director"
+
+#, fuzzy
+#~ msgid "Importing %s as %s"
+#~ msgstr ""
+#~ "Se importă %s.\n"
+#~ "Start %s"
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "Fişier mail-uri locale %s"
+
+#, fuzzy
+#~ msgid "Scanning directory"
+#~ msgstr "Scanez dosarul IMAP"
+
+#, fuzzy
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Nu pot lua dosarul: %s: %s"
+
+#, fuzzy
+#~ msgid "Cannot move folder: %s"
+#~ msgstr ""
+#~ "Nu pot şterge dosarul `%s':\n"
+#~ "%s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Nu pot muta un dosar peste el însuşi."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Nu copia un dosar peste el însuşi."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Nu pot muta un dosar într-unul din descendenţii săi/"
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Precizaţi un dosar pentru a copia dosarul \"%s\" în:"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Copiază dosarul"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Precizaţi un dosar pentru a muta dosarul \"%s\" în:"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Mută dosarul"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot şterge dosarul `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Şterge dosarul '%s'"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot şterge dosarul `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot şterge dosarul `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Crează un grup nou de scurtături."
+
+#~ msgid "Group name:"
+#~ msgstr "Nume grup:"
+
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Chiar doriţi să înlăturaţi grupul\n"
+#~ "`%s' din bara de scurtături?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Redenumeşte grupul de scurtături"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Redenumeşte grupul de scurtături selectat în:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Iconuri mici"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Arată scurtăturile ca iconuri mici"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Iconuri mari"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Arată scurtăturile ca iconuri mari"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "Grup _Nou..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Crează un grup nou de scurtături"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Înlătură acest g_rup..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Înlătură acest grup de scurtături"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Rede_numeşte acest grup..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Redenumeşte acest grup de scurtături"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Ascunde bara de scurtături"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Ascunde bara de scurtături"
+
+#, fuzzy
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Crează o scurtătură nouă"
+
+#, fuzzy
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Crează o scurtătură nouă"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Redenumeşte scurtătura"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Redenumeşte scurtătura selectată în:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Deschide dosarul legat la această scurtătură."
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Deschide în fereastră noua"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Deschide dosarul legat la această scurtătură într-o fereastră nouă"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Redenumeşte această scurtătură"
+
+#, fuzzy
+#~ msgid "Re_move"
+#~ msgstr "Şterge"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Înlătură această scurtătură din bara de scurtături"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Eroare la salvarea scurtăturilor."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Scurtături"
+
+#, fuzzy
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "Deschide în %s..."
+
+#, fuzzy
+#~ msgid "Print Summary"
+#~ msgstr "Rezumat"
+
+#, fuzzy
+#~ msgid "Print summary"
+#~ msgstr "Sumar mail"
+
+#~ msgid "Reload"
+#~ msgstr "Reîncarcă"
+
 #, fuzzy
 #~ msgid "Copy to folder..."
 #~ msgstr "Copiez în folderul..."
@@ -19909,21 +20077,9 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Altă adresă"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Utilitar de import Evolution"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Utilitar de import Evolution"
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Compozitorul de mailuiri Evolution."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Compozitorul de mailuiri Evolution."
-
 #~ msgid "Searching..."
 #~ msgstr "Caut..."
 
@@ -23995,10 +24151,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Întâlniri"
 
 #, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Nu există întâlniri"
-
-#, fuzzy
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%A %d %B"
 
@@ -24433,9 +24585,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Moderate mist"
 #~ msgstr "Ceaţă moderată"
 
-#~ msgid "Thick mist"
-#~ msgstr "Ceaţă densă"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Ceaţă superficială"
 
@@ -24689,9 +24838,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Creez un dosar nou"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Şterge acest dosar"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Afişează un dosar diferit"
 
@@ -26161,10 +26307,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Nu pot şterge elementul din fişierul calendar!\n"
 
 #, fuzzy
-#~ msgid "Importing Data"
-#~ msgstr "Se importă"
-
-#, fuzzy
 #~ msgid "Setup Assistant"
 #~ msgstr "Asistent"
 
@@ -27122,9 +27264,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Add a new service to the Executive Summary"
 #~ msgstr "Adaug un serviciu nou la Executive Summary"
 
-#~ msgid "Create a new email"
-#~ msgstr "Creez un mail nou"
-
 #~ msgid "S_ource"
 #~ msgstr "Sursa"
 
diff --git a/po/ru.po b/po/ru.po
index 43566738b7..fd3cbf75ed 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\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"
+"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"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -50,8 +51,7 @@ msgstr "Здесь настраивается автозавершение"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Контакты"
 
@@ -91,19 +91,20 @@ msgstr "Evolution folder settings configuration control"
 msgid "Manager your S/Mime certificates here"
 msgstr "Здесь можно управлять вашими сертификатами S/Mime"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -111,65 +112,65 @@ msgstr "Новая адресная книга"
 msgid "Delete"
 msgstr "Удалить"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Создать контакт"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Создание нового контакта"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Создать список контактов"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Список _контактов"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Создание нового списка контактов"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Не удается подключиться к серверу LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Сбой аутентификации на сервере LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Не удается выполнить запрос в корневом DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Сервер отвечает без поддержки баз поиска"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Ошибка при загрузке информации schema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Сервер не отвечает корректной информацией schema"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Перенос..."
 
@@ -186,39 +187,41 @@ msgstr ""
 "Производится преобразование папок для новой версии..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Переносится '%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "На этом компьютере"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Личный"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "На серверах LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "Серверы LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "Настройка автозавершения"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -231,7 +234,7 @@ msgstr ""
 "поднимите ограничения для выдачи результатов в\n"
 "настройках сервера каталога для этой адресной книги."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -244,19 +247,21 @@ msgstr ""
 "поднимите ограничения времени в настройках сервера\n"
 "каталога для этой адресной книги."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
+msgstr ""
+"База данных для этой адресной книги не смогла обработать текущий запрос."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+msgstr ""
+"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Этот запрос завершился с ошибкой."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -264,7 +269,7 @@ msgstr ""
 "Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
 "у вас имеются необходимые права доступа."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -272,7 +277,7 @@ msgstr ""
 "Не удается открыть эту адресную книгу.  Это значит, что либо введен неверный "
 "URI, либо сервер LDAP недоступен."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 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 "
@@ -283,7 +288,7 @@ msgstr ""
 "текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
 "ниже ссылке."
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -291,26 +296,32 @@ msgstr ""
 "Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
 "URI, либо сервер недоступен."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Не удается открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимное подключение к серверу LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Ошибка проверки подлинности.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведите пароль для %s (пользователь %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
-msgstr "UID источника контактов, который будет показывать этот элемент просмотра"
+msgstr ""
+"UID источника контактов, который будет показывать этот элемент просмотра"
+
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, показываемый календарем"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -357,7 +368,7 @@ msgstr "  _Показывать поддерживаемые типы "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -389,19 +400,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Помощник по созданию адресной книги"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Свойства адресной книги"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Источники адресных книг"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Источники адресных книг..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Всегда"
 
@@ -410,8 +424,10 @@ msgid "Anonymously"
 msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -419,51 +435,52 @@ msgstr ""
 "\n"
 "Нажмите \"Применить\", чтобы сохранить изменения."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Подключение"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Отличительное _имя (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution будет использовать это значение DN для проверки вашей подлинности "
 "на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
 msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Готово"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Общие"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Группа:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Никогда"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -478,23 +495,23 @@ msgstr ""
 "Узнайте у вашего системного администратора, используются ли эти\n"
 "протоколы на вашем сервере LDAP "
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Один"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Диапазон поиска: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Поиск"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Выбрано:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -504,7 +521,7 @@ msgstr ""
 "вашим\n"
 "сервером LDAP только в том случае, если он поддерживает SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -521,7 +538,7 @@ msgstr ""
 "вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не будет\n"
 "использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -532,7 +549,7 @@ msgstr ""
 "Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL\n"
 "и TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -542,40 +559,42 @@ msgstr ""
 "Выбор этой опции позволит вам изменить настройки Evolution по умолчанию\n"
 "для поисков LDAP и для создания и редактирования контактов."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Указание отображаемого имени является первым шагом в настройке адресной "
 "книги."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Шаг 1: Описание папки"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "Шаг 2: Сведения о сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "Шаг 3: Подключение к серверу"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "Шаг 4: Поиск в каталоге"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Под"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Поддерживаемые базы поиска"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -587,7 +606,7 @@ msgstr ""
 "в ваших поисках, и как долго должен выполняться запрос. Спросите у \n"
 "вашего системного администратора, нужно ли вам изменять эти опции."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -598,7 +617,7 @@ msgstr ""
 "откуда начнется ваш поиск. Если вы оставите это поле пустым,\n"
 "то поиск начнется с корня дерева каталогов."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -612,11 +631,13 @@ msgstr ""
 "под каталогом начала поиска. Глубина поиска \"one\" включает в себя\n"
 "элементы на один уровень ниже каталога начала поиска.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -627,22 +648,23 @@ msgstr ""
 "необходимости свяжитесь со своим системным\n"
 "администратором."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Максимальное число элементов для загрузки. Установка очень большого\n"
 "значения может серьезно замедлить работу вашей адресной книги."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -652,7 +674,7 @@ msgstr ""
 "что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
 "доступа к вашему серверу LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -661,7 +683,7 @@ msgstr ""
 "Это имя сервера будет появляться в списке каталогов Evolution.\n"
 "Оно используется только для отображения."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -670,7 +692,7 @@ msgstr ""
 "Это имя, которое будет появляться в списке папок Evolution. Оно используется "
 "только для отображения."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -681,28 +703,28 @@ msgstr ""
 "Список стандартных портов ранее уже был предоставлен. Спросите вашего\n"
 "системного администратора, какой из них вам необходимо использовать."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Этот параметр определяет, как долго будет производиться поиск."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "И_спользовать SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "По отличительному имени (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "По почтовому адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Когда это возможно"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -713,19 +735,19 @@ msgstr ""
 "и вашей регистрационной информации. Если вы не уверены, что точно\n"
 "знаете все подробности, узнайте их у вашего системного администратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Показать имя:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -734,39 +756,39 @@ msgstr "Ограничение загрузки:"
 msgid "_Edit"
 msgstr "_Правка"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Метод подключения:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Номер порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Имя _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Задержка (минут):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "карточек"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "вкладка соединения"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "общая вкладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "вкладка поиска"
 
@@ -881,7 +903,7 @@ msgstr "Сотрудничество"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -975,10 +997,10 @@ msgstr "_Категории..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1026,15 +1048,15 @@ msgid "_Web page address:"
 msgstr "_Веб-страница:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Адрес"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2018,102 +2040,111 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: 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:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "Служба"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "Адрес"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Домашний"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Служебное"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Другие"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Книга-источник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr "Книга назначения"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Является новым конактом"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Поля для записи"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Изменено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Имя учетной записи"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Редактор категорий недоступен."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2121,7 +2152,7 @@ msgstr ""
 "Вы действительно хотите\n"
 "удалить эти контакты?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2129,46 +2160,51 @@ msgstr ""
 "Вы действительно хотите\n"
 "удалить этот контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не удается найти элемент управления для поля: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Изменить все"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Полное имя:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "_Эл. адрес:"
 
@@ -2324,11 +2360,11 @@ msgid "Is New List"
 msgstr "является новым списком"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Редактор списка контактов"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Сохранить список как VCard"
 
@@ -2417,13 +2453,13 @@ msgid "Email begins with"
 msgstr "Почтовый адрес начинается с"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категории "
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
@@ -2440,98 +2476,97 @@ msgid "Type"
 msgstr "Тип"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "Адресная книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Создать контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Создать список контактов..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Импорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Найти контакты..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Address Book Sources..."
 msgstr "Источники адресных книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Настройка Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслать контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Отправить сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Печать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Напечатать конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Copy to Address Book..."
 msgstr "Копировать в адресную книгу..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 msgid "Move to Address Book..."
 msgstr "Переместить в адресную книгу..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вырезать"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Копировать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Вставить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Текущий вид"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2543,8 +2578,8 @@ msgstr ""
 "Необходимо перезапустить Evolution."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Любая категория"
 
@@ -2587,7 +2622,7 @@ msgid "Company Phone"
 msgstr "Телефон компании"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Эл. почта"
 
@@ -2646,7 +2681,7 @@ msgid "Nickname"
 msgstr "Псевдоним"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Примечание"
 
@@ -2655,7 +2690,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Организация"
 
@@ -2781,61 +2816,67 @@ msgstr "Выбрано"
 msgid "Has Cursor"
 msgstr "Имеет курсор"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Участники списка"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "Эл. почта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 msgid "work"
 msgstr "работа"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 msgid "Position"
 msgstr "Должность"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Группа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr "Видеоконференции"
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 msgid "Phone"
 msgstr "Телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr "Факс"
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 msgid "personal"
 msgstr "личный"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Блог"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Должность"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Домашняя страничка"
 
@@ -2844,8 +2885,8 @@ msgid "Success"
 msgstr "Успешно"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2875,7 +2916,7 @@ msgstr "Протокол не поддерживается"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2895,7 +2936,8 @@ msgid "TLS not Available"
 msgstr "TLS недоступен"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Адресная книга не существует"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3029,7 +3071,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Добавить адрес к существующему контакту \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Поиск в адресной книге..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3084,17 +3127,40 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm importer"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar importer"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar importer"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "Напечатать контакты"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "Напечатать контакт"
 
@@ -3186,7 +3252,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Параметры"
 
@@ -3317,7 +3383,8 @@ msgid "Export in asynchronous mode "
 msgstr "Экспорт в асинхронном режиме "
 
 #: 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 ""
 "Количество карточек в одном файле вывода в асинхронном режиме, по умолчанию "
 "100"
@@ -3327,7 +3394,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 ""
 "Ошибка аргументов командной строки, используйте параметр --help, чтобы "
 "просмотреть доступные аргументы."
@@ -3364,8 +3432,8 @@ msgstr "Не указано имя файла."
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Ввод пароля"
 
@@ -3442,10 +3510,9 @@ msgid "Evolution's Tasks component"
 msgstr "Компонент задач Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Задачи"
 
@@ -3489,26 +3556,26 @@ msgstr "Напомнить через (минут)"
 msgid "_Edit appointment"
 msgstr "_Изменить встречу"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Открыть"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Открыть"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+#, fuzzy
+msgid "Dismiss"
 msgstr "_Закрыть"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+#, fuzzy
+msgid "Dismiss All"
 msgstr "Закрыть _все"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Описание не доступно."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3521,12 +3588,12 @@ msgstr ""
 "Начало в %s\n"
 "Окончание в %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3538,7 +3605,7 @@ msgstr ""
 "Вместо этого Evolution отобразит нормальный диалог\n"
 "напоминания."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3555,19 +3622,19 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Не задавать больше этот вопрос."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Не удается инициализировать Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Не удается инициализировать gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удается создать фабрику сервиса уведомления о сигнале"
 
@@ -3706,24 +3773,30 @@ msgstr "Показывать ли время в 24-часовом формате
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показывать ли номера недель в навигаторе по датам"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "\"Коротко\" содержит"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Описание содержит"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Комментарий содержит"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Прочее"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Календарь"
 
@@ -3755,7 +3828,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
@@ -3777,70 +3850,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Календарь '%s' будет удалён. Вы действительно хотите продолжить?"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Новый календарь"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Еже_дневная встреча"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "К_алендарь"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не удаётся открыть календарь '%s' для создания событий и совещаний"
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
@@ -3972,7 +4045,7 @@ msgstr "часов"
 msgid "minutes"
 msgstr "минут"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Действие/Переключатель"
 
@@ -4044,7 +4117,7 @@ msgid "hour(s)"
 msgstr "часов"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "минут"
 
@@ -4055,7 +4128,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Включено"
 
@@ -4105,7 +4178,7 @@ msgstr "30 минут"
 msgid "60 minutes"
 msgstr "60 минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Предупреждения"
 
@@ -4130,7 +4203,7 @@ msgid "Days"
 msgstr "Дней"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Включить"
 
@@ -4271,7 +4344,7 @@ msgid "_Fri"
 msgstr "Пят"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Общие"
 
@@ -4366,7 +4439,7 @@ msgstr ""
 "Нажмите кнопку \"Применить\", чтобы сохранить изменения."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Новый список задач"
 
@@ -4453,7 +4526,8 @@ msgstr "URL _источника:"
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
-msgstr "Удаляемое событие является собранием, хотите отправить уведомление об отмене?"
+msgstr ""
+"Удаляемое событие является собранием, хотите отправить уведомление об отмене?"
 
 #: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
@@ -4532,23 +4606,23 @@ msgstr "%s Вы ничего не изменили. Обновить редак�
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " к "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (к дате"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "К дате"
 
@@ -4584,8 +4658,8 @@ msgstr "Запись в журнале - %s"
 msgid "No summary"
 msgstr "Нет Краткого описания"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Сохранить как..."
 
@@ -4615,9 +4689,20 @@ msgstr "Назначение:"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
-msgstr ""
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Назначение:"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Календарь"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Новый список задач"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4721,7 +4806,7 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Встреча"
 
@@ -4745,23 +4830,32 @@ msgstr "Планировка"
 msgid "Meeting"
 msgstr "Собрание"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Дата завершения рашьше даты окончания!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Неверное время завершения"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не удаётся открыть календарь '%s'."
@@ -4837,29 +4931,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Нет"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Выбранный организатор больше не имеет учетной записи."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "Доверить..."
 
@@ -4977,8 +5071,10 @@ 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?"
-msgstr "Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5044,7 +5140,7 @@ msgstr " "
 msgid "occurrences"
 msgstr "случаи"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Дата/Время"
 
@@ -5077,7 +5173,7 @@ msgid "_No recurrence"
 msgstr "Без повторения"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Удалить"
 
@@ -5119,7 +5215,7 @@ msgstr ""
 "\n"
 "Сохранить изменения?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Отклонить изменения"
 
@@ -5137,13 +5233,14 @@ msgstr "Информация о собрании была изменена. От
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr "Информация о назначении задачи была изменена. Отправить обновлённую версию?"
+msgstr ""
+"Информация о назначении задачи была изменена. Отправить обновлённую версию?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Информация о задаче была изменена. Отправить обновлённую версию?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
@@ -5156,7 +5253,7 @@ msgstr "% _Выполнено"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Выполнено"
 
@@ -5169,7 +5266,7 @@ msgstr "Высокий"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "В процессе"
 
@@ -5188,7 +5285,7 @@ msgstr "Нормальный"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Не начато"
 
@@ -5228,16 +5325,16 @@ msgstr "Основные"
 msgid "Assignment"
 msgstr "Назначение"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Дата завершения рашьше даты окончания!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не удается открыть задачи в '%s'."
@@ -5248,7 +5345,7 @@ msgstr "Кон_фиденциально"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Описание:"
 
@@ -5435,11 +5532,10 @@ msgstr "Дата начала"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Сводка"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "цвет"
 
@@ -5464,7 +5560,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "В"
 
@@ -5499,10 +5595,10 @@ msgstr "Нет"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -5515,99 +5611,105 @@ msgstr "Повторение"
 msgid "Assigned"
 msgstr "Назначено"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Новая задача"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Перейти к сег_одняшнему дню"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Пере_йти к дате..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Открыть"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Настройка..."
 
@@ -5694,7 +5796,7 @@ msgid "Alarms"
 msgstr "Сигналы"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Выполнено"
 
@@ -5752,26 +5854,26 @@ msgstr "Деления через %02i минут"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -5954,7 +6056,7 @@ msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отменить"
@@ -6158,11 +6260,13 @@ msgstr "Объект некорректен и не может быть обно
 
 #: calendar/gui/e-itip-control.c:1833
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
+msgstr ""
+"Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
 #: calendar/gui/e-itip-control.c:1845
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
+msgstr ""
+"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
 #: calendar/gui/e-itip-control.c:1864
 msgid "There was an error on the CORBA system\n"
@@ -6409,12 +6513,12 @@ msgstr "Приоритет:"
 msgid "Web Page:"
 msgstr "Веб-страница:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "Нажмите, чтобы открыть %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6424,7 +6528,7 @@ msgstr ""
 "%s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6432,12 +6536,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6446,28 +6550,38 @@ msgstr ""
 "Ошибка открытия %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Загрузка задач"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Очистка папки"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Загрузка задач"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Встреча - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "Открывается %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6587,16 +6701,16 @@ msgstr "Информация о занятости (%s в %s)"
 msgid "iCalendar information"
 msgstr "Информация iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Введите пароль для %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6608,7 +6722,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6620,12 +6734,12 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr "Дни рождения и годовщины"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr "В Сети"
 
@@ -6814,49 +6928,49 @@ msgstr "Выбранный месяц (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Выбранный год (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Задание"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Завершено процентов: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Контакты: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Предварительный просмотр"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Напечатать элемент"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Настройка печати"
 
@@ -6865,36 +6979,36 @@ msgstr "Настройка печати"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Список задач '%s' будет удален. Вы действительно хотите продолжить?"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Задача"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Новый список задач"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Список задач"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Создать новый список задач"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Не удается открыть список задач '%s' для создания событий и собраний"
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6951,20 +7065,20 @@ msgstr "Файлы iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Файлы vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Очистить старые встречи и собрания"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Напоминание!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "События календаря"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6972,7 +7086,7 @@ msgstr ""
 "Evolution обнаружены файлы календаря Gnome.\n"
 "Хотите импортировать их в Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Календарь Gnome"
 
@@ -8634,7 +8748,7 @@ msgstr "Не удается открыть сообщение"
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
@@ -8705,7 +8819,8 @@ msgstr "Неподдерживаемая операция: поиск выраж
 #: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
+msgstr ""
+"Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
 
 #: camel/camel-folder.c:1322
 msgid "Moving messages"
@@ -8720,7 +8835,7 @@ msgstr "Копирование сообщений"
 msgid "Filtering new message(s)"
 msgstr "Получение %d сообщений"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8731,15 +8846,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8748,32 +8863,29 @@ msgstr ""
 "Введите ключевую фразу, чтобы разблокировать\n"
 "ключ пользователя: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Нет данных"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Не удается зашифровать это сообщение: Не определены корректные получатели"
+msgstr ""
+"Не удается зашифровать это сообщение: Не определены корректные получатели"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8784,59 +8896,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Сбой при кодировании GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не удается проверить подпись сообщения: Неверный формат сообщения"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Не удается проверить подпись сообщения: не удается создать временный файл: %s"
+msgstr ""
+"Не удается проверить подпись сообщения: не удается создать временный файл: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "Зашифрованное содержимое"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "Не удается разобрать содержимое сообщения"
 
@@ -8948,21 +9061,35 @@ msgstr "Сбой при декодировании части MIME: некорр
 msgid "parse error"
 msgstr "Ошибка обработки"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Провайдер виртуальных папок электронной почты"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Для чтения почты по запросу к другому набору папок"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Не удается загрузить %s: Загрузка модулей не поддерживается в этой системе."
+msgstr ""
+"Не удается загрузить %s: Загрузка модулей не поддерживается в этой системе."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не удается загрузить %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не удается загрузить %s: в модуле нет инициализирующего кода."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Провайдер для протокола \"%s\" не доступен"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonymous"
@@ -9115,7 +9242,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
@@ -9252,20 +9379,7 @@ msgstr "Сбой поиска узла: узел не найден"
 msgid "Host lookup failed: unknown reason"
 msgstr "Сбой поиска узла: неизвестная причина"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Провайдер виртуальных папок электронной почты"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Для чтения почты по запросу к другому набору папок"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Провайдер для протокола \"%s\" не доступен"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9334,21 +9448,25 @@ msgstr "Подписано: %s <%s>: %s\n"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не удается получить папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не удается создать папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удается удалить папку: %s: недопустимая операция"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Корзина"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Спам"
@@ -9579,21 +9697,31 @@ msgstr "Нет сообщения %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удается удалить папку: %s: нет такой папки"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удается переименовать папку: %s: недопустимая операция"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удается переименовать папку: %s: нет такой папки"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Вы не можете копировать сообщения из папки NNTP!"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Вы не можете копировать сообщения из папки NNTP!"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9606,17 +9734,14 @@ msgstr "Проверять новую почту во всех папках"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr ""
+"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Автоматически синхронизировать удаленную почту локально"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "Адресная книга"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "Имя сервера LDAP:"
@@ -9635,44 +9760,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Для доступа к серверам Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Пароль"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Подключение к серверу IMAP будет производиться с использованием "
 "незашифрованного пароля."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "По умолчанию"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "список"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9681,26 +9804,26 @@ msgstr ""
 "Тревожное сообщение от сервера IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неожиданный ответ от сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Не полный ответ сервера."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ответ сервера IMAP не содержит информации о %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неожиданный ответ \"OK\" от сервера IMAP: %s"
@@ -9715,7 +9838,7 @@ msgstr "Не удается создать каталог %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Не удается загрузить краткую информацию о %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Папка была уничтожена и заново создана на сервере."
 
@@ -9724,12 +9847,12 @@ msgstr "Папка была уничтожена и заново создана
 msgid "Scanning for changed messages"
 msgstr "Поиск изменённых сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Не удается получить сообщение: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9745,25 +9868,25 @@ msgstr ""
 "Не удается получить сообщение: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент недоступно"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Получение краткой информации по новым сообщениям "
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Не удается найти тело сообщения в ответе на команду FETCH."
 
@@ -9816,29 +9939,40 @@ msgstr "Пространство имен"
 
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr ""
+"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Проверять новую почту во всех папках"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Проверять новую почту во всех папках"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Сервис IMAP для %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9847,64 +9981,64 @@ msgstr "Сервис IMAP для %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удается подключиться к %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Расширение SSL/TLS не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Сбой согласований SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не удается подключиться командой \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9915,23 +10049,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестная родительская папка: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Эта папка не может содержать подпапки"
 
@@ -9952,7 +10095,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Не удается подключиться к серверу POP на %s"
@@ -10035,8 +10178,8 @@ msgstr ""
 "папок в стиле Elm, Pine или Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10048,55 +10191,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не удается получить папку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Локальное хранилище не имеет папки Входящие"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локальный почтовый файл %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не удается переименовать папку %s в %s: %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не удается переименовать \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Не удается удалить мета-файл папки '%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Не удается сохранить краткую информацию: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не удается добавить сообщение к краткой информации: причина неизвестна"
 
@@ -10114,53 +10257,44 @@ msgstr "Не удается добавить сообщение к папке п
 msgid "Invalid message contents"
 msgstr "Неверное содержание сообщения"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Не удается открыть папку \"%s\":\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Не удается получить папку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Папка \"%s\" не существует."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Не удается создать папку \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" не является почтовым каталогом."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не удается удалить папку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10182,9 +10316,9 @@ msgid "Checking for new messages"
 msgstr "Проверка новых сообщений"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Сохранение папки"
@@ -10228,156 +10362,134 @@ msgstr "Видимо, папка невостановимо испорчена."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой при создании сообщения: почтовый ящик поврежден?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Не удается открыть файл \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "Не удается создать папку с таким именем."
 
-#: camel/providers/local/camel-mbox-store.c:170
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Не удается создать каталог '%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Не удается вложить файл %s: не обычный файл"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Не удается создать файл \"%s\":\n"
+"Не удается удалить папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" не является обычным файлом."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Не удается удалить папку \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папка \"%s\" не пуста. Не удалена."
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "Не удается создать папку с таким именем."
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Не удается создать каталог '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Имя новой папки недопустимо."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не удается переименовать \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не удается переименовать %s в %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не удается открыть папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не удается проверить папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не удается открыть файл: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удается открыть временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не удается закрыть исходную папку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не удается закрыть временную папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удается переименовать папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несовпадение папки и краткой информации о ней даже после синхронизации"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Не удается сохранить папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ошибка записи во временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
@@ -10391,10 +10503,17 @@ msgstr "Добавление сообщения к папке MH отменен�
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Не удается добавить сообщение к папке mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Не удается создать папку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" не является каталогом."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Не удается получить папку: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10416,6 +10535,29 @@ msgstr "Спул \"%s\" не является обычным файлом или
 msgid "Folder `%s/%s' does not exist."
 msgstr "Папка \"%s/%s\" не существует."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Не удается открыть папку \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Папка \"%s\" не существует."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Не удается создать папку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10569,7 +10711,8 @@ msgstr ""
 " %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -10582,7 +10725,8 @@ msgstr "Новости USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Это провайдер для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это провайдер для чтения и отправки сообщений в группы новостей USENET."
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
 msgid ""
@@ -10650,46 +10794,46 @@ msgstr "Не удается переименовать папку %s в %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Не удается переместить папку в собственную подпапку."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, c-format
 msgid "Connection error: %s"
 msgstr "Ошибка соединения: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Нет такой папки: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Не удается получить группу: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr "Не удается получить сообщения: неуказанная ошибка"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Сбой команды NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Поиск новых сообщений"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Неизвестный ответ сервера: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Использование отменено"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Сбой операции: %s"
@@ -10736,7 +10880,7 @@ msgstr "Удалять через %s дней"
 msgid "Disable support for all POP3 extensions"
 msgstr "Запретить поддержку всех расширений POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10826,7 +10970,7 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10878,7 +11022,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10930,7 +11074,8 @@ msgstr "Запрошенное почтовое действие выполне�
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
-msgstr "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
+msgstr ""
+"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
@@ -10950,7 +11095,8 @@ msgstr "Пользователь не локальный; установите <
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+msgstr ""
+"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11046,7 +11192,7 @@ msgstr "Доставка SMTP почты через %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удается отправить сообщение: неверный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
@@ -11130,7 +11276,8 @@ msgstr "Ошибка при ответе на DATA"
 #: camel/providers/smtp/camel-smtp-transport.c:1341
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
+msgstr ""
+"Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1361
 msgid "DATA termination response error"
@@ -11154,34 +11301,34 @@ msgstr "Превышено время ожидания ответа на зап�
 msgid "QUIT response error"
 msgstr "Ошибка при ответе на QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "вложение"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Удалить выбранные элементы из списка вложений"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Добавить вложение..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Вложить файл в сообщение"
 
@@ -11299,18 +11446,19 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Attach file(s)"
 msgstr "Вложить файл(ы)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11319,30 +11467,30 @@ msgstr ""
 "Ошибка при чтении файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Файл существует, перезаписать?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Ошибка доступа к файлу: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Не удается получить сообщение из редактора"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11351,7 +11499,7 @@ msgstr ""
 "Не удается переместиться по файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11360,7 +11508,7 @@ msgstr ""
 "Не удается обрезать файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11369,7 +11517,7 @@ msgstr ""
 "Не удается скопировать дескриптор файла: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11378,7 +11526,7 @@ msgstr ""
 "Ошибка при автосохранении сообщения: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11387,7 +11535,7 @@ msgstr ""
 "Обнаружены несохранённые файлы предыдущей сессии.\n"
 "Произвести попытку восстановления?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11398,43 +11546,43 @@ msgstr ""
 "\n"
 "Сохранить изменения?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Внимание: Изменено сообщение"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Подпись:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Создана автоматически"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Новое сообщение"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11442,7 +11590,7 @@ msgstr ""
 "Не удается создать окно редактора:\n"
 "Не удается активировать управляющий элемент выбора адреса."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11454,7 +11602,7 @@ msgstr ""
 "Убедитесь, что у вас установлены необходимые\n"
 "версии пакетов gtkhtml и libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11462,7 +11610,7 @@ msgstr ""
 "Не удается создать окно редактора:\n"
 "Не удается активировать компонент редактора HTML."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11816,7 +11964,7 @@ msgstr "Тогда"
 msgid "You must specify a folder."
 msgstr "Необходимо указать папку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Выбрать папку"
@@ -11831,19 +11979,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Важное"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Выполнить"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Позже"
 
@@ -11931,7 +12079,7 @@ msgstr ""
 "Дата сообщения будет сравниваться относительно\n"
 "текущего времени запуска фильтра."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Виртуальные папки"
 
@@ -11947,7 +12095,7 @@ msgstr "назад"
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "секунд"
 
@@ -12116,7 +12264,7 @@ msgstr "не отмечено"
 msgid "Junk Test"
 msgstr "Проверка на спам"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Надпись"
@@ -12222,9 +12370,10 @@ msgstr "начинается с"
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Тема"
 
@@ -12232,25 +12381,25 @@ msgstr "Тема"
 msgid "Unset Status"
 msgstr "Снять состояние"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Имя правила '%s' не уникально, выберите другое"
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Правила"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Добавить правило"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Изменить правило"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Имя правила"
 
@@ -12290,15 +12439,15 @@ msgstr "Тема содержит"
 msgid "Subject does not contain"
 msgstr "Тема не содержит"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Укажите имя этой виртуальной папки."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Необходимо указать хотя бы одну папку в качестве источника."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Источник виртуальных папок"
 
@@ -12307,7 +12456,8 @@ msgid "Composer Preferences"
 msgstr "Настройка редактора"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Тут настраиваются параметры почты, включая безопасность и отображение "
 "сообщений"
@@ -12348,9 +12498,9 @@ msgstr "Evolution Mail folder viewer"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Почта"
 
@@ -12358,7 +12508,7 @@ msgstr "Почта"
 msgid "Mail Accounts"
 msgstr "Учётные записи"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Настройка почты"
 
@@ -12396,15 +12546,15 @@ msgstr "Необходимо указать верное название скр
 msgid "[script]"
 msgstr "[скрипт]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Язык(и)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Добавить подпись скрипта"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Подпись(и)"
 
@@ -12488,7 +12638,6 @@ msgid "Unread messages"
 msgstr "Непрочитанных сообщений"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<щёлкните здесь, чтобы выбрать папку>"
 
@@ -12496,291 +12645,310 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Create New Folder"
 msgstr "Создание новой папки"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Имя папки:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr "На этом компьютере"
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Входящие"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Создать новую папку"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Не удается удалить папку \"%s\": %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Не удается удалить папку: %s: нет такой папки"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Действительно удалить папку \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Удалить \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Не удается переименовать папку: %s: нет такой папки"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Переименовать папку \"%s\" в:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Переименование папки"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Папка с именем \"%s\" Уже существует. Используйте другое имя."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "Пере_местить"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Пе_реименовать"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Свойства..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Печать"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Ответить в с_писок"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Пе_реслать"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "К _исполнению..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "_Флаг \"Выполнено\""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "О_чистить флаг"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Пометит_ь как непрочитанные"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Пометить как неважное"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Пометить как _спам"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не спам"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "В_осстановить"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Добавить отправителя в _адресную книгу"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Применить _фильтры"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Созда_ть правило из сообщения"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Виртуальная папка по теме"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Виртуальная папка по отправителю"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Виртуальная папка по получателю"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Виртуальная папка по списку рассылки"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "Виртуальная папка по подшивке"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "Фильтр по подшивке"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "По умолчанию"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "Совпадения: %d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "Не подписано"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
-msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Подпись действительна"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Подпись недействительна"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12788,11 +12956,11 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12800,11 +12968,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Не зашифровано"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -12812,69 +12980,69 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Зашифровано"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr "Этот сертификат нельзя просмотреть"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "Просроченные задачи:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "_Встроенный просмотр"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
@@ -12917,29 +13085,34 @@ msgstr "Указатель на неизвестные внешние данны
 msgid "Formatting message"
 msgstr "Форматирование сообщения"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "От"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Скр.копия"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
@@ -12953,8 +13126,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "Дата"
 
@@ -12971,19 +13144,24 @@ msgstr "Не удается разобрать сообщение S/MIME: Неи
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Неподдерживаемый формат подписи"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Неизвестная ошибка при проверке подписи"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12995,57 +13173,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Ошибка при определении узла '%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Неозаглавленное сообщение"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "Установить как _фон"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Отправить сообщение в список..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "_Добавить в адресную книгу"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
@@ -13093,17 +13271,17 @@ msgstr "Настройки фильтров"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пересланное сообщение --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "В сообщении от %d.%m.%Y %H:%M %%s пишет:"
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13112,7 +13290,7 @@ msgstr ""
 "Не удается сохранить в '%s'\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13121,29 +13299,35 @@ msgstr ""
 "'%s' уже существует.\n"
 "Перезаписать его?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "сообщение"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Файл '%s' существует и не является обычным файлом"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "Сохранить сообщение ..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Добавить адрес"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Почта от %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не удается создать временный каталог: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13156,7 +13340,7 @@ msgstr ""
 "\n"
 "Уничтожить сообщения?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13181,298 +13365,310 @@ msgid "Check incoming mail being junk"
 msgstr "Проверять, являются ли входящие сообщения спамом"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Проверять на спам учетные записи IMAP"
-
-#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour"
 msgstr "Цвет подсветки цитирования"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Цвет подсветки цитирования."
 
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Composer Window default height"
+msgstr "Высота окна сообщения по умолчанию"
+
 #: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Composer Window default width"
+msgstr "Ширина окна сообщения по умолчанию"
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Кодировка по умолчанию для составления сообщений"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Кодировка по умолчанию для составления сообщений."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Кодировка по умолчанию для отображения сообщений"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Кодировка по умолчанию для отображения сообщений."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Стиль пересылки по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Высота окна сообщения по умолчанию"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Высота окна сообщения по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Стиль ответа по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Ширина окна сообщения по умолчанию"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Ширина окна сообщения по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Очищать корзину при выходе"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Очищать все корзины при выходе из Evolution."
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Список учетных записей"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Регистрировать действия фильтра"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Регистрировать действия фильтра в указанном файле журнала."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Файл журнала действий фильтра"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Файл журнала действий фильтра."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Помечать сообщение как прочитанное через определенное время."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Высота окна сообщения по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Ширина окна сообщения по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Тип отображения сообщения (нормальное, все заголовки, исходный текст)"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Звуковой файл извещения о новой почте"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Тип извещения о новой почте"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Предупреждать, если тема пустая"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Предупреждать, если пользователь пытается очистить удаленные сообщения в "
 "папке."
 
-#: mail/evolution-mail.schemas.in.in.h:46
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:49
+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:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Предупреждать, если пользователь заполнил только поле Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
+msgstr ""
+"Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr ""
+"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr ""
+"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Распознавать ссылки в тексте и заменять их."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Распознавать эмоции в тексте и заменять их значками."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Проверять на спам входящую почту"
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Проверять на спам входящую почту для учетных записей IMAP (действительно "
-"только в том случае, если установлен параметр check_incoming)"
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Отправлять почту в формате HTML по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Отправлять почту в формате HTML по умолчанию."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Показывать анимацию"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Показывать анимированные изображения как анимации."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Показывать удаленные сообщения (как перечеркнутые) в списке сообщений."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Показывать удаленные сообщения в списке сообщений"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Показывать панель предварительного просмотра"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Показывать панель предварительного просмотра."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Звуковой файл, воспроизводимый при приходе новой почты."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Указывает тип желаемого извещения о новой почте."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Шрифт терминала"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Шрифт терминала (моноширинный) для отображения почты"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Пропорциональный шрифт для отображения почты"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13480,167 +13676,164 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Подшивать список сообщений."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Подшивать список сообщений"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Подшивать список сообщений по полю \"Тема\""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Задержка перед помечанием сообщения как просмотренное"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Задержка перед помечанием сообщения как просмотренное."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "Строка UID основной учетной записи."
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Использовать клиент и демон Spamassassin"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Использовать клиент и демон Spamassassin (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Использовать другие шрифты"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Использовать другие шрифты для отображения почты"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Использовать только локальные спам-тесты."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Использовать только локальные спам-тесты (без DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Шрифт переменной ширины"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "Порт spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Импорт вашей почты из Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Импорт..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Подождите пожалуйста"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Импорт %s в качестве %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканирование %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Импорт файлов"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13648,16 +13841,44 @@ msgstr ""
 "Обнаружены почтовые файлы Elm.\n"
 "Хотите импортировать их в Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Папка _черновиков:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Импорт"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Импорт файлов"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканирование %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Фильтр приоритета \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13683,7 +13904,7 @@ msgstr ""
 "импортированные фильтры и убедитесь, что они работают, \n"
 "как и предполагалось."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13694,7 +13915,7 @@ msgstr ""
 "используют возможности \"Игнорировать связи\" или \"Соблюдать связи\",\n"
 "не поддерживаемые в Evolution. Эти фильтры будут сброшены."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13707,31 +13928,24 @@ msgstr ""
 "что не поддерживается в Evolution. Эти фильтры будут изменены\n"
 "на проверку наличия (отсутствия) заданной строки в теле письма."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Импорт информации из Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Сканирование почтовых фильтров"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Сканирование каталога"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Начало импортирования"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Импорт информации из Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Настройки"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Почтовые фильтры"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13739,11 +13953,20 @@ msgstr ""
 "Найдены почтовые файлы Netscape.\n"
 "Хотите импортировать их в Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Импорт информации из Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Импорт файлов"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Адресная книга"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13751,7 +13974,7 @@ msgstr ""
 "Обнаружены почтовые файлы Pine.\n"
 "Хотите импортировать их в Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13794,19 +14017,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Вы не ввели всю необходимую информацию."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Редактор учетных записей Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Путь:"
 
@@ -13858,28 +14081,43 @@ msgstr ""
 "    '%s'\n"
 "И были обновлены."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "У вас есть неотправленные сообщения, вы действительно хотите выйти?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Почтовое сообщение..."
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Новая виртуальная папка"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Почтовые фильтры"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Создать новый календарь"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, показываемый календарем"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Подлинность"
 
@@ -13922,7 +14160,7 @@ msgstr ""
 "Введите информацию о способе отправки электронной почты. Если вы не уверены, "
 "свяжитесь со своим системным администратором или поставщиком услуг Интернета."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Управление учетными записями"
 
@@ -13949,119 +14187,115 @@ msgid "Connecting to server..."
 msgstr "Подключение к серверу..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " Проверка поддерживаемых типов "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(В этой сборке Evolution SSL не поддерживается)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(В этой сборке Evolution SSL не поддерживается)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Отображаемые заголовки письма</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Всегда шифровать моим ключом, когда посылается шифрованная почта"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Редактор учетных записей"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Информация об учетной записи"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Добавить _скрипт"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Добавить новую подпись..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Всегда шифровать моим ключом при отправке зашифрованной почты"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Всегда отправлять невидимую копию (Bcc) на:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Всегда отправлять копию (Cc) на:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Всегда доверять ключам в моем наборе ключей при кодировании"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Вложить оригинальное сообщение"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Вложение"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Проверка подлинности"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Набор символов:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Цвета"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Проверять _входящую почту"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Проверять орфографию в процессе ввода _текста"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Проверка новой почты"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Проверяет, являются ли входящие сообщения спамом"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Цвет для _ошибочных слов:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Создание сообщений"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Настройка"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14077,140 +14311,136 @@ msgstr ""
 "\n"
 "Нажмите \"Применить\", чтобы сохранить ваши настройки."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Сделать основной"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Поведение по умолчанию"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Кодировка символов по умолчанию:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Удаление почты"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Всегда подписывать сообщения, когда используется эта учетная запись"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "Не проверять входящую почту для записей IMAP"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Не цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не подписывать приглашения (для совместимости с Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Папка _черновиков:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Учетные записи электронной почты"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_Электронная почта:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Очищать корзину при выходе"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _сертификата:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учетным записям Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Фиксированная ширина:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Параметры фильтра"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Свойства шрифтов"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Форматировать сообщения в _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Заголовки"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Выделять _цитирование:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Встроенное"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Ярлыки и цвета"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Загрузка изображений"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Расположение почтового ящика"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Составление сообщения"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Отображение сообщений"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Шрифты сообщений"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Уведомление о новой почте"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14218,142 +14448,142 @@ msgstr ""
 "Примечание: вам не будет предложено ввести пароль до первого подключения к "
 "серверу"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Пр_едупреждать при отправке сообщений, в которых определены только "
 "получатели скрытой копии."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Шрифты для печати"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "П_араметры получения"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Запомнить этот _пароль"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Восстановить значения по умолчанию"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Безопасность"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Безопасный MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Выберите шрифт HTML фиксированной ширины"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Выберите шрифт HTML фиксированной ширины для печати"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Выберите шрифт HTML переменной ширины"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Выберите шрифт HTML переменной ширины для печати"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "ID _сертификата:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Проверка _орфографии"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14363,7 +14593,7 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения. "
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14373,7 +14603,7 @@ msgstr ""
 "орфографии. В списке языков отображены те, для которых у вас установлены "
 "словари."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14381,15 +14611,15 @@ msgstr ""
 "Укажите имя, используемое для дальнейших обращений к этой \n"
 "учетной записи. Например, \"Служебная\" или \"Личная\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Использовать _демон"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Переменной ширины:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14399,171 +14629,172 @@ msgstr ""
 "\n"
 "Нажмите \"Далее\" для начала настройки. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Добавить подпись"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Всегда загружать изображения"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Всегда подписывать сообщения, когда используется эта учетная запись"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Тип проверки подлинности: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Тип проверки подлинности: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Автоматически проверять новую почту каждые"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Автоматически вставлять изображение эмоций"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Звуковой сигнал при приходе новой почты"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Запрашивать подтверждение очистки папки от удаленных сообщений"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Подпись по _умолчанию:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "По _умолчанию"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не уведомлять о приходе новой почты"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Включить"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Шифровать исходящие сообщения (по умолчанию)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Стиль _пересылки:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Полное имя:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Почта _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Идентификация"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "Спа_м"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Загружать изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Только _локальные тесты"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Сделать основной учетной записью"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "По_мечать сообщения как \"Прочитанные\" через:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Никогда не загружать изображения"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Воспроизводить звуковой файл при приходе новой почты"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgstr ""
+"_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Предупреждать при отправке сообщений с пустой темой"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Получение почты"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Стиль _ответа:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Восстановить настройки по умолчанию"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Выбрать..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Отправка почты"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Показывать анимированные изображения "
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Подписи"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Стандартный шрифт:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Шрифт _терминала:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Использовать _защищенное соединение (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Использовать такие же шрифты, как и прочие приложения"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
@@ -14586,7 +14817,7 @@ msgstr ""
 "Ошибка при выполнении операции:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Обработка"
 
@@ -14598,12 +14829,12 @@ msgstr "Фильтрация папки"
 msgid "Fetching Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ошибка применения фильтров исходящей почты: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14612,116 +14843,116 @@ msgstr ""
 "Ошибка добавления в %s: %s\n"
 "Производится добавление в локальную папку \"Отправленные\"."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ошибка сохранения в локальной папке \"Отправленные\": %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Очистка папки"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Очистка корзины в '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Локальные папки"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получение %d сообщений"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14730,7 +14961,7 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14739,11 +14970,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14752,22 +14983,22 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Отключение от %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Переподключение к %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Изменение статуса спама"
 
@@ -14799,38 +15030,38 @@ msgstr "Шифрование"
 msgid "Security Information"
 msgstr "Сведения о безопасности"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Отмена..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Путь: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Получение и отправка почты"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Отменить _все"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Ожидание..."
 
@@ -14939,20 +15170,20 @@ msgstr ""
 "    '%s'\n"
 "и была обновлена."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Править виртуальную папку"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Попытка редактирования несуществующей виртуальной папки \"%s\"."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Новая виртуальная папка"
 
@@ -15179,7 +15410,8 @@ msgstr ""
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
-msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr ""
+"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid ""
@@ -15188,7 +15420,8 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-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:12
@@ -15267,97 +15500,20 @@ msgstr "Папки автономной работы"
 msgid "Autocompletion Folders"
 msgstr "Папки автозавершения"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Не удается скопировать папку: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Не удается переместить папку: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Не удается переместить папку в саму себя."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Не удается скопировать папку в саму себя."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Не удается переместить папку в собственную подпапку."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Указать папку, в которую будет скопирована папка \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Копирование папки"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Укажите папку, в которую будет перемещена папка \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Перемещение папки"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Не удается удалить папку:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Действительно удалить папку \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Не удается удалить папку:\n"
+"Не удается создать указанную папку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Указанное имя папки не допустимо: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Выбранная папка не принадлежит другому пользователю"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Не удается удалить папку:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Не удается создать указанную папку:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
@@ -15493,7 +15649,7 @@ msgstr "Сбой при исполнении gpg."
 msgid "_Import"
 msgstr "_Импорт"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Закрытие соединений..."
 
@@ -15531,6 +15687,10 @@ msgstr "Не удается открыть общую папку: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Не удается найти указанную общую папку."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Начало импортирования"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15598,7 +15758,8 @@ msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
 #: shell/e-shell-window.c:327
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
 "перехода в режим работы вне сети."
@@ -15608,7 +15769,8 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
 
 #: shell/e-shell-window.c:340
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
 "для перехода в режим работы в сети."
@@ -15637,123 +15799,6 @@ msgstr "База данных настроек не найдена"
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Создать новую группу ярлыков"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Имя группы:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Вы действительно хотите удалить группу \"%s\" из панели ярлыков?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Переименовать группу ярлыков"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Переименовать выбранную группу ярлыков в:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Маленькие пиктограммы"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Показывать ярлыки как маленькие пиктограммы"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Большие пиктограммы"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Показывать ярлыки как большие пиктограммы"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Добавить группу..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Создать новую группу ярлыков"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Удалить эту группу..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Удалить эту группу ярлыков"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Переименовать эту группу..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Переименовать эту группу ярлыков"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Скрыть панель ярлыков"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Скрыть панель ярлыков"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Создать ярлыки по умолчанию"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Создать ярлыки по умолчанию"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Переименование ярлыка"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Переименовать выбранный ярлык в:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Открыть папку, связанную с этим ярлыком"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Открыть в новом окне"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Открыть папку, связанную с этим ярлыком, в новом окне"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Переименовать этот ярлык"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Удалить"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Удалить этот ярлык из панели ярлыков"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Ошибка сохранения ярлыков."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Ярлыки"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Флажок"
@@ -15764,11 +15809,6 @@ msgstr "Флажок"
 msgid "New"
 msgstr "Создать"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" в \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15912,7 +15952,8 @@ msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
+msgstr ""
+"Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -16048,47 +16089,47 @@ msgstr ""
 "%s: --online и --offline не могут использоваться одновременно.\n"
 "Используйте %s --help для получения более подробной информации.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "Выберите сертификат для импорта..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "Имя сертификата"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "Назначения"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Серийный номер"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr "Годен до"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "Электронная почта"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Истек срок действия сертификата: %s\n"
 "Поставщик: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Введите пароль для '%s'"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -16097,7 +16138,7 @@ msgstr ""
 "Выпущен для:\n"
 "  Тема: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16160,7 +16201,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Сертификат"
 
@@ -16225,11 +16266,11 @@ msgstr "Подразделение организации (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Отпечаток SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "Сертификат клиента SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "Сертификат сервере SSL"
 
@@ -16263,7 +16304,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
@@ -16274,212 +16316,212 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Ваши сертификаты"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 msgid "Certificate already exists"
 msgstr "Сертификат уже существует"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "Версия"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "Версия 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "Версия 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr "Использование ключа сертификата"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr "Тип сертификата Netscape"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr "Идентификатор ключа поставщика"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Идентификатор объекта (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr "Идентификатор алгоритма"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr "Параметры алгоритма"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr "Публичный ключ темы"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Ошибка: не удается обработать расширение"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Объект подписан"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr "Поставщик сертификата SSL"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr "Поставщик сертификата эл. почты"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Нет информации"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "вложение"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr "Сертификат подписан"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr "CRL подписан"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 msgid "Critical"
 msgstr "Критично"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Не критично"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "Расширения"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Алгоритм подписи сертификата"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "Поставщик"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr "Уникальный ID темы"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr "Значение подписи сертификата"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Пароль файла PKCS12"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Введите пароль для файла PKCS12:"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Импортированный сертификат"
 
@@ -16501,7 +16543,8 @@ msgstr "Описание вложения."
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr "Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+msgstr ""
+"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
 
 #: tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
@@ -16998,7 +17041,8 @@ msgid "Hide _Read Messages"
 msgstr "Скрыть п_рочитанные сообщения"
 
 #: 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
@@ -17066,7 +17110,8 @@ msgid "_Threaded Message List"
 msgstr "Показывать подшивки в списке сообщений"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "_Добавить отправителя в адресную книгу"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17074,7 +17119,8 @@ msgid "A_pply Filters"
 msgstr "Применить _фильтры"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Добавить отправителя в адресную книгу"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17520,10 +17566,6 @@ msgstr "Фор_мат"
 msgid "HT_ML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Открыть"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Открыть файл"
@@ -17884,22 +17926,6 @@ msgstr "_Получить и отправить"
 msgid "_Window"
 msgstr "_Окно"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Напечатать Сводку"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Напечатать Сводку"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Перезагрузить"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Перезагрузить окно просмотра"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "По _компании"
@@ -17960,8 +17986,8 @@ msgstr "C _категорией:"
 msgid "_Tasks"
 msgstr "_Задачи"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18205,23 +18231,23 @@ msgstr "П_оиск"
 msgid "_Find Now"
 msgstr "_Найти сейчас"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "О_чистить"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID элемента"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID субэлемента"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Текст"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Найти _сейчас"
 
@@ -18235,3 +18261,216 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Источники адресных книг"
+
+#~ msgid "No data provided"
+#~ msgstr "Нет данных"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается открыть файл \"%s\":\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается создать каталог '%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается создать файл \"%s\":\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "\"%s\" не является каталогом."
+
+#~ msgid "On this Computer"
+#~ msgstr "На этом компьютере"
+
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Проверять на спам учетные записи IMAP"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Проверять на спам входящую почту для учетных записей IMAP (действительно "
+#~ "только в том случае, если установлен параметр check_incoming)"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Импорт %s в качестве %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Сканирование почтовых фильтров"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Сканирование каталога"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "Не проверять входящую почту для записей IMAP"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Не удается скопировать папку: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Не удается переместить папку: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Не удается переместить папку в саму себя."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Не удается скопировать папку в саму себя."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Не удается переместить папку в собственную подпапку."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Указать папку, в которую будет скопирована папка \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Копирование папки"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Укажите папку, в которую будет перемещена папка \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Перемещение папки"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается удалить папку:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Действительно удалить папку \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается удалить папку:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Выбранная папка не принадлежит другому пользователю"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удается удалить папку:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Создать новую группу ярлыков"
+
+#~ msgid "Group name:"
+#~ msgstr "Имя группы:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Вы действительно хотите удалить группу \"%s\" из панели ярлыков?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Переименовать группу ярлыков"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Переименовать выбранную группу ярлыков в:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Маленькие пиктограммы"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Показывать ярлыки как маленькие пиктограммы"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Большие пиктограммы"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Показывать ярлыки как большие пиктограммы"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Добавить группу..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Создать новую группу ярлыков"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Удалить эту группу..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Удалить эту группу ярлыков"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Переименовать эту группу..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Переименовать эту группу ярлыков"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Скрыть панель ярлыков"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Скрыть панель ярлыков"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Создать ярлыки по умолчанию"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Создать ярлыки по умолчанию"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Переименование ярлыка"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Переименовать выбранный ярлык в:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Открыть папку, связанную с этим ярлыком"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Открыть в новом окне"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Открыть папку, связанную с этим ярлыком, в новом окне"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Переименовать этот ярлык"
+
+#~ msgid "Re_move"
+#~ msgstr "Удалить"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Удалить этот ярлык из панели ярлыков"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Ошибка сохранения ярлыков."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Ярлыки"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" в \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Напечатать Сводку"
+
+#~ msgid "Print summary"
+#~ msgstr "Напечатать Сводку"
+
+#~ msgid "Reload"
+#~ msgstr "Перезагрузить"
+
+#~ msgid "Reload the view"
+#~ msgstr "Перезагрузить окно просмотра"
diff --git a/po/sk.po b/po/sk.po
index d6868b8e37..e5df69a95d 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -55,8 +55,7 @@ msgstr "Nastavenie emailových účtov"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -97,20 +96,20 @@ msgstr "Ovládací prvok pre priečinok nastavenia Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Adresár"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -118,67 +117,67 @@ msgstr "Adresár"
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Nový kontakt:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Vytvoriť nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Vytvoriť nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Nepodarilo sa prihlásiť na IMAP serveri"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Nepodarilo sa vykonať dotaz na koreňovom DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Server odpovedal nepodporovanými databázami hľadania"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Chyba pri načítavaní informácie zo schémy"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Server neodpovedal platnou informáciou o schéme"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakám..."
@@ -192,42 +191,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Prehľadávam %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Osobný"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Priečinky automatického dopĺňania"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -239,7 +240,7 @@ msgstr ""
 "dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
 "serveru pre tento adresár."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -250,19 +251,19 @@ msgstr ""
 "alebo pre tento adresár. Prosím, upresnite hľadanie alebo zvýšte\n"
 "časový limit v nastavení adresárového serveru pre tento adresár."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Podpora tohto adresára nedokázala spracovať tento dotaz."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Podpora tohto adresára odmietla vykonať tento dotaz."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebol dokončený úspešne."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -271,7 +272,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta\n"
 "existuje a že máte dostatočné práva."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -280,7 +281,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -291,7 +292,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -300,28 +301,33 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo server nefunguje."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Používam server LDAP anonymne"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Nepodarilo sa prihlásiť.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadajte heslo pre %s (používateľ %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, ktoré bude kalendár zobrazovať"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -365,7 +371,7 @@ msgstr "Zobraziť _podporované základy"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -398,20 +404,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Asistent nastavenia LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Zdroje adresára"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Zdroje adresára"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Zdroje adresára..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Vždy"
 
@@ -422,7 +429,8 @@ msgstr "Anonymne"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -431,51 +439,51 @@ msgstr ""
 "\n"
 "Prosím, stlačte \"Dokončiť\", aby sa nastavenie uložilo."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Pripojenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Známe meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Dokončené"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Všeobecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Skupina"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nikdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -489,23 +497,23 @@ msgstr ""
 "(Transport Layer Security) pre šifrované zabezpečenie spojenia.\n"
 "To, ktorý z nich používa váš server LDAP, zistíte od jeho administrátora."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Rozsah hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Hľadám"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Vybrané:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -514,7 +522,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -529,7 +537,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:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -540,7 +548,7 @@ 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:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -550,43 +558,44 @@ msgstr ""
 "Táto voľba umožňuje zmeniť štandardné nastavenie Evolution\n"
 "pre hľadanie pomocou LDAP a pre vytváranie a úpravu kontaktov."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Zadanie mena displeja je rýchly požadovaný krok v nastavení serveru LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Krok 1. Informácie o serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Krok 2. Pripojenie k serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Krok 3. Hľadanie v adresári"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -598,7 +607,7 @@ msgstr ""
 "vašich hľadaní a ako dlho môže hľadanie trvať. Váš administrátor\n"
 "by vám mal povedať, či potrebujete tieto hodnoty zmeniť."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -609,7 +618,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -624,12 +633,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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -639,22 +649,23 @@ msgstr ""
 "Pridanie nového serveru vyžaduje niektoré špeciálne informácie,\n"
 "ktoré by vám mal poskytnúť administrátor vášho systému."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Toto je maximálny počet sťahovaných kariet. Ak nastavíte príliš veľké číslo, "
 "tento adresár bude pomalý."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -663,7 +674,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -673,7 +684,7 @@ msgstr ""
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -684,7 +695,7 @@ msgstr ""
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -695,28 +706,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Použiť _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Použiť známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Použiť e-mailovú adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Ak je to možné"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -728,19 +739,19 @@ msgstr ""
 "a informácií pre prihlásenie. Ak ich nepoznáte, kontaktujte vášho\n"
 "systémového administrátora."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Meno pre zo_brazenie:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -749,39 +760,39 @@ msgstr "Obmedzenie _sťahovania:"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Spôsob _prihlásenia:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "Ča_kanie (minúty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -904,7 +915,7 @@ msgstr "Spolupráca"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -999,10 +1010,10 @@ msgstr "Ka_tegórie..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1050,15 +1061,15 @@ msgid "_Web page address:"
 msgstr "Adresa _WWW stránky:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2050,109 +2061,117 @@ msgid "AOL Instant Messenger"
 msgstr "_Poslať správu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Zoznam bez mena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Poslať správu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Služba pripravená"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Umiestnenie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Po_užívateľ:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Domov"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Zamestnanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Iné"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Zdroj"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Zmenené"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Meno účtu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Editor kategórií nie je k dispozícii."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Uložiť kontakt ako VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2160,53 +2179,58 @@ msgstr ""
 "Naozaj chcete odstrániť\n"
 "tieto kontakty?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 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.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Zamestnanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Skupina"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Upraviť celé"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Celé meno:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E_mail:"
 
@@ -2365,11 +2389,11 @@ msgid "Is New List"
 msgstr "Je nový zoznam"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Uložiť zoznam ako VCard"
 
@@ -2460,13 +2484,13 @@ msgid "Email begins with"
 msgstr "E-mail končí na"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategória je"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
@@ -2483,101 +2507,101 @@ msgid "Type"
 msgstr "Typ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Adresár"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Uložiť ako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Nový kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Nový zoznam kontaktov..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Prejsť do priečinku..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importovať..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Hľadať kontakty..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Zdroje adresára..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Nastavenie pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Predať ďalej kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tlačiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Tlačiť obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresár..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresár..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vystrihnúť"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopírovať"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktuálny pohľad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2589,8 +2613,8 @@ msgstr ""
 "spadlo. Aby ste ho mohli znovu použiť, musíte Evolution reštartovať."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
@@ -2633,7 +2657,7 @@ msgid "Company Phone"
 msgstr "Firemný felefón"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mail"
 
@@ -2695,7 +2719,7 @@ msgid "Nickname"
 msgstr "Prezývka"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Poznámka"
 
@@ -2704,7 +2728,7 @@ msgid "Office"
 msgstr "Pracovisko"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -2832,69 +2856,75 @@ msgstr "Výbrané"
 msgid "Has Cursor"
 msgstr "Má kurzor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Členovia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Zamestnanie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Skupina"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Osobný"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Boloňa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Činnosť/po_zícia:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Domáci fax"
@@ -2904,8 +2934,8 @@ msgid "Success"
 msgstr "Úspech"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2937,7 +2967,7 @@ msgstr "Protokol nepodporovaný"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2957,7 +2987,8 @@ msgid "TLS not Available"
 msgstr "TLS nie je k dispozícii"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adresár neexistuje"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3099,7 +3130,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Otázka pre adresár..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3157,18 +3189,38 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Import LDIF do Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Import VCard do Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Import formátu VCard do Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Tlačiť vybrané kontakty"
@@ -3261,7 +3313,7 @@ msgstr "Okraje"
 msgid "Number of columns:"
 msgstr "Počet stĺpcov:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Nastavenie"
 
@@ -3444,8 +3496,8 @@ msgstr "Nezadané meno súboru."
 msgid "Unnamed List"
 msgstr "Zoznam bez mena"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Zadajte heslo"
@@ -3526,10 +3578,9 @@ msgid "Evolution's Tasks component"
 msgstr "Testovací komponent Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Úlohy"
 
@@ -3573,26 +3624,24 @@ msgstr "Čas opakovania (minúty)"
 msgid "_Edit appointment"
 msgstr "_Upraviť schôdzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Otvoriť"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Otvoriť"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3601,12 +3650,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Varovanie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3617,7 +3666,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3634,19 +3683,19 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie je možné inicializovať gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
 
@@ -3791,24 +3840,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Popis obsahuje"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Nenájdené"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendár"
 
@@ -3841,7 +3896,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3863,77 +3918,77 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nová celodenná schôdzka"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Celodenná Schôdzka"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Kalen_dár:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový priečinok"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4068,7 +4123,7 @@ msgstr "hodín"
 msgid "minutes"
 msgstr "minút"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4141,7 +4196,7 @@ msgid "hour(s)"
 msgstr "hodín"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minút"
 
@@ -4152,7 +4207,7 @@ msgstr "začiatok schôdzky"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Povolené"
 
@@ -4204,7 +4259,7 @@ msgstr "30 minút"
 msgid "60 minutes"
 msgstr "60 minút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alarmy"
 
@@ -4229,7 +4284,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Povoliť"
 
@@ -4372,7 +4427,7 @@ msgid "_Fri"
 msgstr "P_ia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Všeobecné"
 
@@ -4474,7 +4529,7 @@ msgstr ""
 "Prosím, stlačte \"Dokončiť\", aby sa nastavenie uložilo."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Zoznam úloh"
@@ -4644,23 +4699,23 @@ msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 msgid "Validation error: %s"
 msgstr "Chyba validácie: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr "u do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Dokončený "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Termín do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Termín do "
 
@@ -4696,8 +4751,8 @@ msgstr "Položka denníka - %s"
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
@@ -4726,11 +4781,21 @@ msgstr "Zrušiť operáciu"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendár"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Zoznam úloh"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4837,7 +4902,7 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Schôdzka"
 
@@ -4861,23 +4926,32 @@ msgstr "Plánovanie"
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Koncový dátum je pred dátumom začiatku."
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Dátum začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Čas začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Prístup zamietnutý pri otváraní kalendára"
@@ -4957,29 +5031,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizér už nemá účet."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
@@ -5175,7 +5249,7 @@ msgstr " "
 msgid "occurrences"
 msgstr "výskytov"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dátum a čas:"
@@ -5212,7 +5286,7 @@ msgid "_No recurrence"
 msgstr "_Neopakovať"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Odstrániť"
 
@@ -5254,7 +5328,7 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Zahodiť zmeny"
 
@@ -5278,7 +5352,7 @@ msgstr "Informácia o priradení úlohy bola vytvorená. Chcete ju poslať?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informácia o úlohe sa zmenila. Chcete poslať upravenú verziu?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dátum dokončenia je neplatný"
 
@@ -5291,7 +5365,7 @@ msgstr "% hotových"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Dokončený"
 
@@ -5304,7 +5378,7 @@ msgstr "Vysoká"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Prebieha"
 
@@ -5323,7 +5397,7 @@ msgstr "Normálny"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Nezačal"
 
@@ -5365,16 +5439,16 @@ msgstr "Základné"
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Koncový dátum je pred dátumom začiatku."
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie je možné otvoriť adresár"
@@ -5385,7 +5459,7 @@ msgstr "_Tajné"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Popis:"
 
@@ -5579,11 +5653,10 @@ msgstr "Dátum štartu"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Súhrn"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "farba"
 
@@ -5609,7 +5682,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "V"
 
@@ -5644,10 +5717,10 @@ msgstr "Nie"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Neznámy"
@@ -5660,99 +5733,105 @@ msgstr "Opakovanie"
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publikovať informácie o voľnom čase"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Otvoriť"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Nas_tavenie..."
 
@@ -5840,7 +5919,7 @@ msgid "Alarms"
 msgstr "Alarmy"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -5898,26 +5977,26 @@ msgstr "%02i rozdelení minúty"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "popoludní"
@@ -6099,7 +6178,7 @@ msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -6558,12 +6637,12 @@ msgstr "_Priorita:"
 msgid "Web Page:"
 msgstr "Strana"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6573,7 +6652,7 @@ msgstr ""
 "%s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6581,12 +6660,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6595,29 +6674,39 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Dokončujem úlohy..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Nahrávanie obrázkov"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Žiadne schôdzky."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvoriť v %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6737,16 +6826,16 @@ msgstr "Informácie o voľnom čase (%s do %s)"
 msgid "iCalendar information"
 msgstr "Informácie iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6754,7 +6843,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6762,12 +6851,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6956,49 +7045,49 @@ msgstr "Vybraný mesiac (%b - %Y)"
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Úloha"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončených percent: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategórie: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Tlačiť položku"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
@@ -7007,39 +7096,39 @@ msgstr "Nastavenie tlačiarne"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7096,20 +7185,20 @@ msgstr "Súbory iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Súbory vCalendar (.ics)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Verejný priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Pripomenutie!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Udalosti kalendára"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7117,7 +7206,7 @@ msgstr ""
 "Evolution našiel súbory kalendára GNOME.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Kalendár GNOME"
 
@@ -8779,7 +8868,7 @@ msgstr "Nie je možné otvoriť správu"
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
@@ -8865,7 +8954,7 @@ msgstr "Kopírujem správy"
 msgid "Filtering new message(s)"
 msgstr "Získavam %d správ"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8876,15 +8965,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepodarilo sa spracovať radu gpg userid."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepodarilo sa spracovať požiadavku na heslo gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8893,30 +8982,26 @@ msgstr ""
 "Musíte zadať heslo pre odomkntie kľúča\n"
 "pre používateľa: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočakávaná odpoveď od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Nezadané žiadne dáta"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 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:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8927,61 +9012,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nepodarilo sa použiť GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepodarilo sa spustiť gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Nepodarilo sa spustiť gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, 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:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Vytvoriť index obsahu správ"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nie je možné získať správu z editora"
@@ -9092,23 +9177,36 @@ msgstr "Nepodarilo sa dešifrovať časť MIME: neplatná štruktúra"
 msgid "parse error"
 msgstr "chyba spracovania"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Poskytovateľ pošty pre virtuálny priečinok"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Pre čítanie pošty ako otázky na inú množinu priečinkov"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nie je možné načítať %s: Načítavanie modulov nie je na tomto systéme "
 "podporované."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie je možné načítať %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie je možné načítať %s: V module nie je inicializačný kód."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonymný"
@@ -9265,7 +9363,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -9400,20 +9498,7 @@ msgstr "Zlyhalo hľadanie hostiteľa: hostiteľ nenájdený"
 msgid "Host lookup failed: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: neznámy dôvod"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Poskytovateľ pošty pre virtuálny priečinok"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Pre čítanie pošty ako otázky na inú množinu priečinkov"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9483,21 +9568,25 @@ msgstr "Server: %s, Typ: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nie je možné získať priečinok: Neplatná operácia pre tento sklad"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, 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:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nie je možné vytvoriť priečinok: Neplatná operácia pre tento sklad"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Odpadky"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9731,21 +9820,31 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, 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:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9763,16 +9862,11 @@ msgstr ""
 "Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Automaticky kontrolovať novú poštu každých"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adresár"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9792,43 +9886,41 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Heslo"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Štandard"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Hustý opar"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9837,26 +9929,26 @@ msgstr ""
 "Poplach od IMAP serveru %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Odpoveď serveru skončila príliš skoro."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď OK od IMAP serveru: %s"
@@ -9871,7 +9963,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
 
@@ -9880,12 +9972,12 @@ msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
 msgid "Scanning for changed messages"
 msgstr "Hľadám zmenené správy"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepodarilo sa prijať správu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9901,25 +9993,25 @@ msgstr ""
 "Nie je možné získať správu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 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:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 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:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
@@ -9978,27 +10070,37 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Aplikovať filtre na nové správy v priečinku novej pošty na tomto serveri"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Služba IMAP pre %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10007,65 +10109,65 @@ msgstr "Služba IMAP pre %s na %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Zlyhala dohoda SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10076,24 +10178,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+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:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Meno priečinku \"%s\" nie je platné, pretože obsahuje znak \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámy rodičovský priečinok: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
@@ -10115,7 +10225,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nie je možné sa spojiť s POP serverom %s"
@@ -10199,8 +10309,8 @@ msgstr ""
 "alebo Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10212,55 +10322,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, 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:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie je možné premenovať \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nie je možné odstrániť súbor súhrnu priečinku `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie je možné uložiť súhrn: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie je možné pridať správu do súhrnu: neznámy dôvod"
 
@@ -10278,53 +10388,44 @@ msgstr "Nie je možné pridať správu do priečinku maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nie je možné otvoriť priečinok `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nie je možné vytvoriť priečinok `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' nie je priečinok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je možné odstrániť priečinok `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10346,9 +10447,9 @@ msgid "Checking for new messages"
 msgstr "Kontrolujem nové správy"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Ukladám priečinok"
@@ -10392,159 +10493,137 @@ msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Nie je možné otvoriť súbor `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nie je možné vytvoriť priečinok %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Nie je možné priložiť súbor %s: nie je to normálny súbor"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nie je možné vytvoriť súbor `%s':\n"
+"Nie je možné odstrániť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nie je normálny súbor."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nie je možné odstrániť priečinok `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Priečinok `%s' nie je prázdny. Neodstránený."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID karty už existuje"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Zadané meno priečinku nie je platné: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nie je možné premenovať \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie je možné otvoriť priečinok %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Kritická chyba spracovania správy na pozícii %ld v priečinku %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie je možné skontrolovať priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie je možné otvoriť súbor %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie je možné otvoriť dočasnú poštovú schránku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Súhrn a priečinok si neodpovedajú, ani po synchronizácii"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznáma chyba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie je možné uložiť priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Chyba pri zápise do dočasnej schránky: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Zápis do dočasnej schránky zlyhal: %s: %s"
@@ -10558,10 +10637,17 @@ msgstr "Pridanie správy MH zrušené"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nie je možné vytvoriť priečinok `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' nie je priečinok."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Nie je možné získať priečinok: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10583,6 +10669,29 @@ msgstr "Fronta \"%s\" nie je normálny priečinok alebo priečinok"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Priečinok `%s/%s' neexistuje."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nie je možné otvoriť priečinok `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Priečinok `%s' neexistuje."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nie je možné vytvoriť priečinok `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10821,47 +10930,47 @@ msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Neznáma chyba: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Priečinok neexistuje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nie je možné získať skupinu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nie je možné poslať správu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP príkaz zlyhal: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Hľadám nové správy"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Neznáma odpoveď serveru: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Použite Zrušiť"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operácia zlyhala: %s"
@@ -10908,7 +11017,7 @@ msgstr "Odstrániť po %s dňoch"
 msgid "Disable support for all POP3 extensions"
 msgstr "Zakázať podporu pre všetky rozšírenia POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10997,7 +11106,7 @@ msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11049,7 +11158,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos pošty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11216,7 +11325,7 @@ msgstr "Doručenie pošty SMTP pomocou %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie je možné poslať správu: adresa odosielateľa nie je platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Posielam správu"
 
@@ -11322,34 +11431,34 @@ msgstr "Vypršal čas požiadavky QUIT: %s"
 msgid "QUIT response error"
 msgstr "Chyba odpovede QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "príloha"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Odstráni vybrané položky zo zoznamu príloh"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
@@ -11467,19 +11576,19 @@ msgstr "<kliknutím vyberiete priečinok>"
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11488,30 +11597,30 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11520,7 +11629,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11529,7 +11638,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11538,7 +11647,7 @@ msgstr ""
 "Nepodarilo sa skopírovať deskriptor súboru: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11547,7 +11656,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11556,7 +11665,7 @@ msgstr ""
 "Ximian Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o ich záchranu?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11567,43 +11676,43 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automaticky generované"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11611,7 +11720,7 @@ 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:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11623,7 +11732,7 @@ msgstr ""
 "Overte, že máte nainštalovanú správnu verziu\n"
 "gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11631,7 +11740,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11983,7 +12092,7 @@ msgstr "Potom"
 msgid "You must specify a folder."
 msgstr "Musíte zadať meno priečinku."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
@@ -11998,19 +12107,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Dôležité"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Urobiť"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Neskôr"
 
@@ -12099,7 +12208,7 @@ msgstr ""
 "Dátum správy bude porovnaný\n"
 "s aktuálnym časom filtrovania."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuálne priečinky"
 
@@ -12115,7 +12224,7 @@ msgstr "späť"
 msgid "months"
 msgstr "mesiacov"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -12285,7 +12394,7 @@ msgstr "nie je označený"
 msgid "Junk Test"
 msgstr "Jún"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Popis"
@@ -12393,9 +12502,10 @@ msgstr "začína na"
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Predmet"
 
@@ -12403,25 +12513,25 @@ msgstr "Predmet"
 msgid "Unset Status"
 msgstr "Zrušiť nastavenie stavu"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Meno pravidla \"%s\" nie je unikátne. Vyberte iné."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Pravidlá"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Upraviť pravidlo"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Meno pravidla"
 
@@ -12461,15 +12571,15 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Musíte tento vpriečinok pomenovať."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Zdroj vPriečinku"
 
@@ -12518,9 +12628,9 @@ msgstr "Zobrazenie poštového priečinku Evolution"
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Pošta"
 
@@ -12528,7 +12638,7 @@ msgstr "Pošta"
 msgid "Mail Accounts"
 msgstr "Poštové účty"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Nastavenie pošty"
 
@@ -12566,15 +12676,15 @@ msgstr "Musíte zadať platné meno skriptu."
 msgid "[script]"
 msgstr "(skript)"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Jazyky"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Pridať skript pre podpis"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Podpisy"
 
@@ -12661,7 +12771,6 @@ msgid "Unread messages"
 msgstr "Nasledujúca _neprečítaná správa"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
@@ -12669,395 +12778,412 @@ msgstr "<kliknutím vyberiete priečinok>"
 msgid "Create New Folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Meno priečinku:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VPriečinky"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Načítavam..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nie je možné odstrániť priečinok `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Naozaj odstrániť priečinok \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Odstrániť \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenovať priečinok \"%s\" na:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Premenovať priečinok"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Otvoriť v novom okne"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Presunúť"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "Nový _priečinok..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "_Odpoveď..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Vyčistiť _značku"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "_Použiť filtre"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Štandard"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím pridáte úlohu"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Odpovedá:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Priradené"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Upraviť podpis"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Upraviť podpis"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Prerušené"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Šifrovanie PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _certifikátu:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikát ešte nie je platný"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Po termíne:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Skryť"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
@@ -13101,29 +13227,34 @@ msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 msgid "Formatting message"
 msgstr "Presúvam správy"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Poštový klient"
 
@@ -13137,8 +13268,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13156,21 +13287,26 @@ msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Nepodporovaná schéma"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nepodarilo sa overiť listový podpis"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Nepodarilo sa overiť listový podpis"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13182,61 +13318,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, 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"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, 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"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nepodarilo sa nájsť meno hostiteľa '%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Save As..."
 msgstr "Uložiť _ako..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Správa bez mena"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Poslať _správu zoznamu..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pridať odosielateľa do adresára"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
@@ -13286,18 +13422,18 @@ msgstr "Filtre"
 msgid "-------- Forwarded Message --------"
 msgstr "Predaná správa"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13306,7 +13442,7 @@ msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13315,32 +13451,38 @@ msgstr ""
 "'%s' už existuje.\n"
 "Prepísať ho?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Správa"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Uložiť správu ako..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Adresa"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Pošta od %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13353,7 +13495,7 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13379,211 +13521,225 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Štandardný predmet pre správu."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Štandardný predmet pre správu."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Štýl _preposielania:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Štandardný predmet pre správu."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Štandardný predmet pre správu."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Š_týl odpovede:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Poštové účty"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Spustiť akcie"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13591,108 +13747,102 @@ msgid ""
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Poslať poštu HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Poslať poštu HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Zobraziť _animované obrázky"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Zobraziť _animované obrázky"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Zobraziť správu normálne"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "_Náhľad"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Kontrola _pravopisu"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Písmo _terminálu:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13700,172 +13850,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Zoznam vlákien"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Zoznam vlákien"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Použiť ako š_tandardný účet"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Premenlivá šírka:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Import formátu mbox pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Import z Pine pre Evolution"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vašu starú pošty Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importujem..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prosím, čakajte"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importujem %s ako %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Prehľadávam %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importujem súbory"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13873,16 +14020,44 @@ msgstr ""
 "Evolution našiel poštové súbory Elm.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Odstrániť tento priečinok"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Vyberte nástroj pre import"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importujem"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importujem súbory"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Prehľadávam %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Filter priority \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13905,7 +14080,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:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13916,7 +14091,7 @@ msgstr ""
 "\"Ignorovať vlákno\" a \"Sledovať vlákno\", ktorú\n"
 "Evolution nepodporuje. Tieto filtre budú zahodené."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13930,31 +14105,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:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Hľadám filtre pošty"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Prehľadávam priečinok"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Spúšťam import"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Poštové filtre"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13962,11 +14130,20 @@ msgstr ""
 "Evolution našiel poštové súbory Netscape.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuje vaše staré dáta Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importujem súbory"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adresár"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13974,7 +14151,7 @@ msgstr ""
 "Evolution našiel poštové súbory Pine.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14017,19 +14194,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili ste všetky povinné informácie."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Cesta:"
 
@@ -14081,28 +14258,43 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Máte neodoslané správy. Chcete skončiť aj tak?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Napísať novú správu"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nový vPriečinok"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Poštové filtre"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Vytvoriť nový priečinok"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, ktoré bude kalendár zobrazovať"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identita"
 
@@ -14145,7 +14337,7 @@ msgstr ""
 "ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
 "poskytovateľa pripojenia na Internet."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Správa účtu"
 
@@ -14171,121 +14363,116 @@ msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "Kontrolovať _podporované typy"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Editor účtu"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informácia o účte"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Pridať _skript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Pridať nový podpis..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Vždy _dôverovať kľúčom v mojom keyringu pri šifrovaní"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Priložiť pôvodnú správu"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Príloha"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltská (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltská (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Znaková sada:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Farby"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Kontrolovať pravopis _priebežne"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Farba pre ne_správne slová:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Nastavenie"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14301,283 +14488,279 @@ msgstr ""
 "\n"
 "Kliknutím na \"Použiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Štandardné chovanie"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Štandardná _znaková sada:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Odstraňovanie správ"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Necitovať pôvodnú správu"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Priečinok _konceptov:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-mailové účty"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_E-mailová adresa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Pe_vná šírka:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Filtre"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Vlastnosti písma"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Písať správy v _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Hlavička"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Popisy a farby"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Nahrávanie obrázkov"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Zobrazovanie správ"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Písma pre správy"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Poznámka: Kým sa prvýkrát nepripojíte, nebudete musieť heslo zadávať."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Písma pre tlač"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citovať pôvodnú správu"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Komu o_dpovedať:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Nastavenie _príjmu"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Zapamätať toto _heslo"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Obnoviť štandardné"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Bezpečnosť"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpečné MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo pevnej širky pre HTML"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo pevnej širky pre tlač HTML"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo premenlivej širky pre HTML"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Samopodpísaný certifikát v reťazci"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Zadajte _meno súboru:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Kontrola _pravopisu"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14586,7 +14769,7 @@ msgstr ""
 "Výstup tohto skriptu sa použije ako vaša signatúra.\n"
 "Zadané meno sa použije iba pre zobrazenie."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14595,7 +14778,7 @@ msgstr ""
 "Táto časť umožňuje nastviť chovanie a jazyk pre kontrolu pravopisu. Zoznam "
 "jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14603,15 +14786,15 @@ msgstr ""
 "Zadajte meno, ako chcete tento účet označovať.\n"
 "Napríklad \"Pracovný\" alebo \"Osobný\"."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Premenlivá šírka:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14621,175 +14804,175 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začnete."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Pridať podpis"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automaticky kontrolovať novú poštu každých"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky vložiť smajlíky"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Píp_nuť pri príchode novej správy"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Š_tandardný podpis:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neuprozorňovať na príchod novej správy"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Štýl _preposielania:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML správy"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identita"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Jún"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Použiť ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako prečítané po"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Prijem pošty"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Odstrániť..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Posielanie pošty"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Zobraziť _animované obrázky"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "Š_tandardné písmo:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "Písmo _terminálu:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Použiť _bezpečné pripojenie (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Použiť rovnaké písma ako ostatné aplikácie"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
@@ -14812,7 +14995,7 @@ msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Pracujem"
 
@@ -14824,12 +15007,12 @@ msgstr "Filtrujem priečinok"
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodarilo sa použiť filtre pre odosielanú poštu : %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14838,116 +15021,116 @@ msgstr ""
 "Nepodarilo sa pridať do %s: %s\n"
 "Namiesto toho sa pridá do priečinka `Odoslané'."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňujem kôš v '%s'"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získavam %d správ"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14956,7 +15139,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14965,11 +15148,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14978,22 +15161,22 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15029,38 +15212,38 @@ msgstr "Výnimky"
 msgid "Security Information"
 msgstr "Informácia o účte"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Ruším..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Cesta: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Zrušiť _všetko"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Čakám..."
 
@@ -15169,20 +15352,20 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokús o úpravu vpriečinku '%s', ktorý neexistuje."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
@@ -15512,97 +15695,20 @@ msgstr "Priečinky off-line"
 msgid "Autocompletion Folders"
 msgstr "Priečinky automatického dopĺňania"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Nie je možné skopírovať priečinok: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Nie je možné presunúť priečinok: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Nie je možné presunúť priečinok do seba."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Nie je možné skopírovať priečinok sám do seba."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopírovať priečinok"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Zadajte priečinok, kam presunúť prečinok \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Presunúť priečinok"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Nie je možné odstrániť priečinok:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Naozaj odstrániť priečinok \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Nie je možné premenovať priečinok:\n"
+"Zadaný priečinok sa nedá vytvoriť:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Zadané meno priečinku nie je platné: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Vybraný priečinok nepatrí inému používateľovi"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nie je možné odstrániť priečinok:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Zadaný priečinok sa nedá vytvoriť:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez mena)"
@@ -15747,7 +15853,7 @@ msgstr "Nepodarilo sa spustiť gpg."
 msgid "_Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
 
@@ -15785,6 +15891,10 @@ msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Nepodarilo sa nájsť zadaný zdieľaný priečinok."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Spúšťam import"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15898,123 +16008,6 @@ msgstr "Konfiguračná databáza nenájdená"
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Vytvoriť novú skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Meno skupiny:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Naozaj chcete odstrániť skupinu \"%s\" z panelu skratiek?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Premenovať skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Premenovať túto skupinu skratiek na:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Malé ikony"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Zobraziť skratky ako malé ikony"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Veľké ikony"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Zobraziť skratky ako veľké ikony"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Pridať skupinu..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Vytvoriť novú skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Odst_rániť túto skupinu..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Odstrániť túto skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Premenovať túto skupinu..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Premenuje túto skupinu skratiek"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Skryť panel skratiek"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Skryť panel skratiek"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Vytvoriť š_tandardné skratky"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Vytvoriť štandardné klávesové skratky"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Premenovať skratku"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Premenovať túto skratku na:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Otvoriť priečinok skratky v novom okn"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Otvoriť v _novom okne"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Otvorí priečinok spojený s touto skratkou v novom okne"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Premenuje túto skratku"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "O_dstrániť"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Odstrániť túto skratku z panelu skratiek"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Chyba pri ukladaní skratiek."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Skratky"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Zaškrtávacie tlačidlo"
@@ -16025,11 +16018,6 @@ msgstr "Zaškrtávacie tlačidlo"
 msgid "New"
 msgstr "Nová"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" v \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16329,59 +16317,59 @@ msgstr ""
 "%s: --online a --offline nie je možné použiť naraz.\n"
 "  Použite %s --help pre zobrazenie dalších informácií.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vyberte nástroj pre import"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Priebeh"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Výraz"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Zliať e-mailovú adresu"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Platnosť certifikátu vypršala: %s\n"
 "Vydal: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Zadajte vaše heslo pre %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16450,7 +16438,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "ID _certifikátu:"
@@ -16525,11 +16513,11 @@ msgstr "Organizáčná jednotka"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16578,240 +16566,240 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID karty už existuje"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "S"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "S"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Nedôveryhodný certifikát"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Predmet je %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Neplatná certifikačná autorita (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Neplatná certifikačná autorita (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Žiadna informácia"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "príloha"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Severmí Karolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Výraz"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s o %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Zlyhanie podpisu certifikátu"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Vložiť"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Predmet je %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Zlyhanie podpisu certifikátu"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "ID _certifikátu:"
@@ -17408,7 +17396,8 @@ msgid "_Threaded Message List"
 msgstr "Zoznam _vlákien"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "_Pridať odosielateľa do adresára"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17416,7 +17405,8 @@ msgid "A_pply Filters"
 msgstr "Použiť _filtre"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Pridať odosielateľa do adresára"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17868,10 +17858,6 @@ msgstr "_Formát"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Otvoriť"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "OtvorĂ­ súbor"
@@ -18243,22 +18229,6 @@ msgstr "_Poslať / Prijať"
 msgid "_Window"
 msgstr "_Nájsť teraz"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Tlač súhrnu"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Tlačiť súhrn"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Aktualizovať"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Znovu načíta pohľad"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Podľa _firmy"
@@ -18325,8 +18295,8 @@ msgstr "S _kategóriou"
 msgid "_Tasks"
 msgstr "Ú_lohy"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18573,23 +18543,23 @@ msgstr "_Nájsť"
 msgid "_Find Now"
 msgstr "_Nájsť teraz"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Vyčistiť"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID položky"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID podpoložky"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Nájsť"
@@ -18604,6 +18574,207 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Zdroje adresára"
+
+#~ msgid "No data provided"
+#~ msgstr "Nezadané žiadne dáta"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné otvoriť súbor `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné vytvoriť priečinok %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné vytvoriť súbor `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' nie je priečinok."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importujem %s ako %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Hľadám filtre pošty"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Prehľadávam priečinok"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Nie je možné skopírovať priečinok: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Nie je možné presunúť priečinok: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Nie je možné presunúť priečinok do seba."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Nie je možné skopírovať priečinok sám do seba."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr ""
+#~ "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopírovať priečinok"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Zadajte priečinok, kam presunúť prečinok \"%s\":"
+
+#~ msgid "Move Folder"
+#~ msgstr "Presunúť priečinok"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné odstrániť priečinok:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Naozaj odstrániť priečinok \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné premenovať priečinok:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Vybraný priečinok nepatrí inému používateľovi"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie je možné odstrániť priečinok:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Vytvoriť novú skupinu skratiek"
+
+#~ msgid "Group name:"
+#~ msgstr "Meno skupiny:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Naozaj chcete odstrániť skupinu \"%s\" z panelu skratiek?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Premenovať skupinu skratiek"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Premenovať túto skupinu skratiek na:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Malé ikony"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Zobraziť skratky ako malé ikony"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Veľké ikony"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Zobraziť skratky ako veľké ikony"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Pridať skupinu..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Vytvoriť novú skupinu skratiek"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Odst_rániť túto skupinu..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Odstrániť túto skupinu skratiek"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Premenovať túto skupinu..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Premenuje túto skupinu skratiek"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Skryť panel skratiek"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Skryť panel skratiek"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Vytvoriť š_tandardné skratky"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Vytvoriť štandardné klávesové skratky"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Premenovať skratku"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Premenovať túto skratku na:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Otvoriť priečinok skratky v novom okn"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Otvoriť v _novom okne"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Otvorí priečinok spojený s touto skratkou v novom okne"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Premenuje túto skratku"
+
+#~ msgid "Re_move"
+#~ msgstr "O_dstrániť"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Odstrániť túto skratku z panelu skratiek"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Chyba pri ukladaní skratiek."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Skratky"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" v \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Tlač súhrnu"
+
+#~ msgid "Print summary"
+#~ msgstr "Tlačiť súhrn"
+
+#~ msgid "Reload"
+#~ msgstr "Aktualizovať"
+
+#~ msgid "Reload the view"
+#~ msgstr "Znovu načíta pohľad"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopírovať do priečinku..."
 
@@ -19249,25 +19420,10 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Zobraziť adresy"
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Import LDIF do Evolution"
-
 #, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Import LDIF do Evolution"
 
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "LDAP Data Interchange Format (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Import VCard do Evolution"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Import formátu VCard do Evolution"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Searching..."
 #~ msgstr "Hľadám...."
 
@@ -27240,9 +27396,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Appointments"
 #~ msgstr "Schôdzky"
 
-#~ msgid "No appointments."
-#~ msgstr "Žiadne schôdzky."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27747,9 +27900,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Moderate mist"
 #~ msgstr "Mierny opar"
 
-#~ msgid "Thick mist"
-#~ msgstr "Hustý opar"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Slabý opar"
 
@@ -28272,9 +28422,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Vytvoriť nové okno pre tento priečinok"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Odstrániť tento priečinok"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Zobraziť iný priečinok"
 
diff --git a/po/sl.po b/po/sl.po
index 77464ec23d..a78730947c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -49,8 +49,7 @@ msgstr "Nastavi mapo..."
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -98,20 +97,20 @@ msgstr "Nastavitev Evolucijine pošte"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -119,45 +118,45 @@ msgstr "Adresar"
 msgid "Delete"
 msgstr "Zbriši"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Nov stik:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Stik"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Nisem se mogel povezati s strežnikom LDAP."
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -165,33 +164,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 #, fuzzy
 msgid "Could not perform query on Root DSE"
 msgstr "Nisem mogel razčleniti niza poizvedbe"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 #, 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakam..."
@@ -205,43 +204,45 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Ustvarjam \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Priština"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Krajevne mape"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -249,7 +250,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -257,19 +258,19 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -278,7 +279,7 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -287,7 +288,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -299,7 +300,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -308,29 +309,34 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Vpišite geslo za %s (uporabnik %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, ki naj ga prikaže brskalnik map"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -375,7 +381,7 @@ msgstr "_Preveri za podprte vrste  "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -409,20 +415,21 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Nastavitev"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Viri adresarja"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Viri _adresarja..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Vedno"
 
@@ -433,65 +440,66 @@ msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Razločno ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "_Poišči"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Skupina"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nikoli"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -501,32 +509,32 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Ena"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Doseg iskanja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Iskanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Selected:"
 msgstr "Zbrisano"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -537,7 +545,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -546,7 +554,7 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -554,42 +562,43 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Podatki o izvorni kodi"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Shranjena iskanja"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -598,7 +607,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -606,7 +615,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -616,32 +625,33 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
 "upočasnilo ta adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -651,7 +661,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -661,7 +671,7 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -671,7 +681,7 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -679,30 +689,30 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Razločno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "Using email address"
 msgstr "E-poštni naslov"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -710,21 +720,21 @@ msgid ""
 "of this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Prikaz"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -733,45 +743,45 @@ msgstr "_Omejitev prenosov"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 #, fuzzy
 msgid "_Port number:"
 msgstr "Številka vrat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "_Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas podaljška spanja (minut)"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 #, fuzzy
 msgid "cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Znova se povezujem z %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 #, fuzzy
 msgid "general-tab"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "searching-tab"
 msgstr "Iskanje"
@@ -901,7 +911,7 @@ msgstr "Sodelovanje"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -1000,10 +1010,10 @@ msgstr "Ka_tegorije..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1055,16 +1065,16 @@ msgid "_Web page address:"
 msgstr "Naslov _spletne strani:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 #, fuzzy
 msgid "Address"
 msgstr "_Naslov:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2057,74 +2067,82 @@ msgid "AOL Instant Messenger"
 msgstr "Na_tisni sporočilo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Neimenovan seznam stikov"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Pošlji sporočilo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Dodaj storitev"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "_Lega:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Uporabniško ime:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Doma"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "Delam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2132,38 +2150,38 @@ msgstr ""
 msgid "Contact"
 msgstr "Stiki"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Virtualne mape"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 #, fuzzy
 msgid "Changed"
 msgstr "Čad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Ime računa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Urejevalnik kategorij ni na voljo."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Shrani stik kot vVizitko"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2172,7 +2190,7 @@ msgstr ""
 "Ste prepričani, \n"
 "da želite zbrisati ta stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2180,49 +2198,54 @@ msgstr ""
 "Ste prepričani, \n"
 "da želite zbrisati ta stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Služba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Idaho"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Skupina"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Uredi celoto"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Polno ime:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2390,11 +2413,11 @@ msgid "Is New List"
 msgstr "Nov seznam"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -2488,13 +2511,13 @@ msgid "Email begins with"
 msgstr "Ime se začne z"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
@@ -2511,108 +2534,108 @@ msgid "Type"
 msgstr "Vrsta"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nov stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 #, fuzzy
 msgid "Import..."
 msgstr "_Uvozi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Išči po kontaktih"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Viri _adresarja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Nastavitve pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2621,8 +2644,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
@@ -2665,7 +2688,7 @@ msgid "Company Phone"
 msgstr "Telefon podjetja"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-pošta"
 
@@ -2727,7 +2750,7 @@ msgid "Nickname"
 msgstr "Vzdevek"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Opomba"
 
@@ -2736,7 +2759,7 @@ msgid "Office"
 msgstr "Pisarna"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -2873,67 +2896,73 @@ msgstr "Zbrisano"
 msgid "Has Cursor"
 msgstr "Sortiranje opravil"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Člani"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Delam"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Skupina"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Priština"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Službeni _naziv:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Domači faks"
@@ -2943,8 +2972,8 @@ msgid "Success"
 msgstr "Uspeh"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2976,7 +3005,7 @@ msgstr "Protokol ni podprt"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2999,7 +3028,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
-msgid "Addressbook does not exist"
+msgid "Address Book does not exist"
 msgstr "Mapa %s ne obstaja"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3143,7 +3172,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Poizvedujem v adresarju..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3203,18 +3233,41 @@ msgstr "Avtorske pravice pridržane 1999, 2000, 2001, 20002 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolucijin uvozni druid"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Na_tisni stike..."
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Na_tisni stike..."
@@ -3307,7 +3360,7 @@ msgstr "Robovi"
 msgid "Number of columns:"
 msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Možnosti"
 
@@ -3492,8 +3545,8 @@ msgstr "Ime datoteke ni navedeno."
 msgid "Unnamed List"
 msgstr "Neimenovan seznam stikov"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Vpišite geslo"
@@ -3581,10 +3634,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolucijin veznik opravil"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Naloge"
 
@@ -3629,26 +3681,24 @@ msgstr "Čas podaljška spanja (minut)"
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Odpri"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Odpri"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3657,12 +3707,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3674,7 +3724,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3691,19 +3741,19 @@ msgstr ""
 "\n"
 "Ste prepričani, da želite pognati ta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
@@ -3849,24 +3899,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Opis vsebuje"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -3899,7 +3955,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3921,77 +3977,77 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sestanek"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sestanek"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Koledar"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4133,7 +4189,7 @@ msgstr "ur"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4207,7 +4263,7 @@ msgid "hour(s)"
 msgstr "ur"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4218,7 +4274,7 @@ msgstr "pričetek sestanka"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Vključeno"
 
@@ -4270,7 +4326,7 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Alerts"
 msgstr "Alberta"
@@ -4297,7 +4353,7 @@ msgid "Days"
 msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Vključi"
 
@@ -4443,7 +4499,7 @@ msgid "_Fri"
 msgstr "_pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Splošno"
 
@@ -4540,7 +4596,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Seznam _nalog"
@@ -4690,23 +4746,23 @@ msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 msgid "Validation error: %s"
 msgstr "Neznana napaka: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Rok "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Rok"
 
@@ -4743,8 +4799,8 @@ msgstr "Vpis v dnevniku - %s"
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Shrani kot..."
 
@@ -4773,11 +4829,21 @@ msgstr "Prekliči operacijo"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Koledar"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Seznam _nalog"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4888,7 +4954,7 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Sestanek"
 
@@ -4912,25 +4978,33 @@ msgstr "Načrtovanje časa"
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Datum pričetka"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nimate dovoljenja"
@@ -5012,29 +5086,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Potreben je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
@@ -5237,7 +5311,7 @@ msgstr "na"
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Datum/ura:"
@@ -5274,7 +5348,7 @@ msgid "_No recurrence"
 msgstr "_Brez ponovitve"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -5317,7 +5391,7 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 #, fuzzy
 msgid "_Discard Changes"
 msgstr "Zavrzi to sporočilo"
@@ -5344,7 +5418,7 @@ msgstr "Podatki o nalogi so bili ustvarjeni. Naj jih pošljem?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "končano "
@@ -5358,7 +5432,7 @@ msgstr "% končano"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "končano"
 
@@ -5371,7 +5445,7 @@ msgstr "visoka"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "v teku"
 
@@ -5390,7 +5464,7 @@ msgstr "običajna"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "ni pričeto"
 
@@ -5432,16 +5506,16 @@ msgstr "Osnovno"
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kliknite tu za odprtje adresarja"
@@ -5452,7 +5526,7 @@ msgstr "_Zaupno"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5644,11 +5718,10 @@ msgstr "Datum pričetka"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Povzetek"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 #, fuzzy
 msgid "color"
 msgstr " barvo"
@@ -5675,7 +5748,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5710,10 +5783,10 @@ msgstr "Ne"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "neznano"
@@ -5726,103 +5799,109 @@ msgstr "Ponovi se"
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Odpri"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Nastavitve pošte..."
@@ -5914,7 +5993,7 @@ msgid "Alarms"
 msgstr "Alarmi"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Končano"
 
@@ -5972,26 +6051,26 @@ msgstr "%02i deljenj minute"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pop"
@@ -6183,7 +6262,7 @@ msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
@@ -6643,12 +6722,12 @@ msgstr "_Prioriteta:"
 msgid "Web Page:"
 msgstr "Stran"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kliknite tu za dodajanje opravila"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6658,7 +6737,7 @@ msgstr ""
 "%s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6666,12 +6745,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6680,31 +6759,41 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Naloži _slike"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Naloži _slike"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Ni sestankovov"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Odpiram '%s'"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6824,16 +6913,16 @@ msgstr "Podatki o zasedenosti (%s do %s)"
 msgid "iCalendar information"
 msgstr "Podatki o iKodledarju"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6841,7 +6930,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6849,12 +6938,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7043,49 +7132,49 @@ msgstr "Izbran mesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Naloga"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteta: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procentov opravljeno: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Stiki: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
@@ -7094,39 +7183,39 @@ msgstr "Nastavitev tiskanja"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7187,22 +7276,22 @@ msgstr "Sporočilo koledarja"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Mapa, ki vsebuje sestanke in dogodke"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Opomnilnik"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Sporočilo koledarja"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7211,7 +7300,7 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Koledar"
 
@@ -8879,7 +8968,7 @@ msgstr "Ne morem dobiti sporočila"
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
@@ -8968,7 +9057,7 @@ msgstr "Kopiram sporočila v %s"
 msgid "Filtering new message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8976,47 +9065,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/camel-gpg-context.c:814
-#, fuzzy
-msgid "No data provided"
-msgstr "Ime datoteke ni navedeno."
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 #, 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:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9024,35 +9108,35 @@ msgid ""
 "%s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisem mogel izvršiti %s: %s\n"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9061,29 +9145,29 @@ msgstr ""
 "Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
 "datoteke: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Šifrirano sporočilo"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
@@ -9197,21 +9281,34 @@ msgstr ""
 msgid "parse error"
 msgstr "Drugačna napaka"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Nuditelj virutalne mape e-pošte"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Noben nuditelj za protokol '%s' ni dostopen"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimno"
@@ -9364,7 +9461,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -9504,20 +9601,7 @@ msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 msgid "Host lookup failed: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Nuditelj virutalne mape e-pošte"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Noben nuditelj za protokol '%s' ni dostopen"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9587,21 +9671,25 @@ msgstr "Strežnik: %s, vrsta: %s:"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Smeti"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9836,21 +9924,31 @@ msgstr "Ni takšnega sporočila %s v %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Ne morete kopirati sporočil iz te mape smeti."
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9867,16 +9965,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adresar"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9896,68 +9989,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Geslo"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Privzeto"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Goste meglice"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan odgovor OK strežnika IMAP: %s"
@@ -9972,7 +10063,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
@@ -9981,12 +10072,12 @@ msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10002,25 +10093,25 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
@@ -10078,27 +10169,37 @@ msgstr "Imenski prostor"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Preveri za nova sporočila v vseh mapah"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Preveri za nova sporočila v vseh mapah"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10107,64 +10208,64 @@ msgstr "storitev %s za %s na %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10175,24 +10276,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Ime mape ne more vsebovati znaka return"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
@@ -10214,7 +10323,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nisem se mogel povezati s strežnikom POP na %s"
@@ -10297,8 +10406,8 @@ 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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10310,55 +10419,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisem mogel odpreti povzetka: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
@@ -10376,53 +10485,44 @@ msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti imenika `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti mape `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' ni imenik vrste maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10446,9 +10546,9 @@ msgid "Checking for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Shranjujem mapo"
@@ -10492,159 +10592,137 @@ msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Ne morem odpreti datoteke '%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Ne morem ustvariti mape s takšnim imenom"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti imenika %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Ne morem pripeti datoteke %s: ni običajna datoteka"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Nisem mogel ustvariti datoteke `%s':\n"
+"Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel zbrisati mape `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Ne morem ustvariti mape s takšnim imenom"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID vizitke že obstaja"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Izbrano ime mape ni veljavno: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisem mogel odpreti imenika %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne morem preveriti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisem mogel odpreti datoteke: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
@@ -10658,10 +10736,17 @@ msgstr "Dodajanje sporočila v MH preklicano"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Nisem mogel ustvariti mape `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' ni imenik."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Ne morem dobiti mape: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10683,6 +10768,29 @@ msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne obstaja."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Nisem mogel odpreti imenika `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mapa `%s' ne obstaja."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nisem mogel ustvariti mape `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
@@ -10915,47 +11023,47 @@ msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Ne morem kopirati mape v eno od naslednic."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ni takšne mape: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Nisem mogel dobiti skupine: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Nisem mogel dobiti sporočila: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Ukaz NNTP ni uspel: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Pregledujem za novimi sporočili"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Neznan odgovor strežnika: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Uporabite preklic"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
@@ -11002,7 +11110,7 @@ msgstr "Zbriši po %s dneh"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11091,7 +11199,7 @@ msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -11145,7 +11253,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11314,7 +11422,7 @@ msgstr "Dostava pošte s SMTP preko %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
@@ -11426,34 +11534,34 @@ msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 msgid "QUIT response error"
 msgstr "Napaka v odgovoru na QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
@@ -11578,20 +11686,20 @@ msgstr "<kliknite tukaj za izbiro mape>"
 msgid "Attach file(s)"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11600,30 +11708,30 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11632,7 +11740,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11641,7 +11749,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11650,7 +11758,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11659,7 +11767,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11668,7 +11776,7 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11679,44 +11787,44 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Podpisi"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11724,7 +11832,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11735,7 +11843,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11743,7 +11851,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12101,7 +12209,7 @@ msgstr "Potem"
 msgid "You must specify a folder."
 msgstr "vMapi morate dati ime."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Izberi mapo"
@@ -12116,20 +12224,20 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Pomembno"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
 msgstr "Seznam opravil"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
 msgstr "po"
@@ -12222,7 +12330,7 @@ msgstr ""
 "Datum tega sporočila bo primerjan s časom,\n"
 "ki ga navedete tu."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
@@ -12238,7 +12346,7 @@ msgstr "nazaj"
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr " sekund"
 
@@ -12411,7 +12519,7 @@ msgstr "ni označeno"
 msgid "Junk Test"
 msgstr "junij"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12524,9 +12632,10 @@ msgstr "se začne z"
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Zadeva"
 
@@ -12535,25 +12644,25 @@ msgstr "Zadeva"
 msgid "Unset Status"
 msgstr "Nastavi stanje"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Ime pravila: "
@@ -12594,15 +12703,15 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "vMapi morate dati ime."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Kot vir morate navesti vsaj eno mapo."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "Viri vMap"
@@ -12661,9 +12770,9 @@ msgstr "Evolucijina komponenta za poštne mape."
 msgid "Evolution Mail preferences control"
 msgstr "Evolucijin veznik Koledarja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Pošta"
 
@@ -12672,7 +12781,7 @@ msgstr "Pošta"
 msgid "Mail Accounts"
 msgstr "Poštni račun"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Nastavitve"
@@ -12715,17 +12824,17 @@ msgstr ""
 msgid "[script]"
 msgstr "_Skripta"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 #, fuzzy
 msgid "Language(s)"
 msgstr "Jezik"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 #, fuzzy
 msgid "Add script signature"
 msgstr "Dodaj nov podpis"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Podpisi"
@@ -12813,7 +12922,6 @@ msgid "Unread messages"
 msgstr "Naslednje _neprebrano sporočilo"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
@@ -12822,402 +12930,420 @@ msgstr "<kliknite tukaj za izbiro mape>"
 msgid "Create New Folder"
 msgstr "Ustvari _novo mapo..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Ime mape:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Dohodna pošta"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Nalagam..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, fuzzy, c-format
 msgid "%s"
 msgstr "s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Zbriši mapo '%s'"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Zbriši \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Preimenuj mapo"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Odpri v novem oknu"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Prestavi"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Nova mapa"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vMapa glede na Pošiljatelja"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Privzeto"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite tu za dodajanje opravila"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Ustreza:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Določena"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Seznam podpisov"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Seznam podpisov"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 #, fuzzy
 msgid "Valid signature, cannot verify sender"
 msgstr "Uredi vsebino podpisa v urejevalniku"
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "šifriranje"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Šifrirano sporočilo"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "šifriranje"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Šifrirano sporočilo"
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _certifikata:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "Naloge s prekoračenim rokom:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Skrij"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
@@ -13261,29 +13387,34 @@ msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 msgid "Formatting message"
 msgstr "Prestavljam sporočila"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Od"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
@@ -13298,8 +13429,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13317,21 +13448,26 @@ msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Nepodprta shema"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13343,61 +13479,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Nisem mogel ustvariti cevi do %s: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Neimenovano sporočilo"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Ozadje:"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Odgovori pošiljatelju"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Pošlji _sporočilo na seznam..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Dodaj adresar"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
@@ -13445,18 +13581,18 @@ msgstr "Filtri"
 msgid "-------- Forwarded Message --------"
 msgstr "Posredovano sporočilo"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13465,7 +13601,7 @@ msgstr ""
 "Nisem mogel odpreti URIja `%s':\n"
 "%s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13474,32 +13610,38 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Sporočilo"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "_Naslov:"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Odpri sporočilo iz \"%s\""
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13512,7 +13654,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13540,215 +13682,229 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Zbriši to sporčilo"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Zbriši to sporčilo"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Zbriši to sporčilo"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Zbriši to sporčilo"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Privzet način posredovanja naprej je: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Preklopi prikaz vrstice z mapami"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Pošlji sporočilo kasneje"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Poštni račun"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13756,106 +13912,100 @@ msgid ""
 msgstr ""
 "Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Privzeto pošiljaj pošto v _HTML obliki."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Privzeto pošiljaj pošto v _HTML obliki."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Kaži čas kot"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Kaži čas kot"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Pano _predogleda"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Prvotni stik:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13863,177 +14013,174 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Niten seznam sporočil"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Niten seznam sporočil"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Spremenljivo"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Uvozi"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvaža vašo staro pošto Elm."
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Uvažam..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prosim pokačajte"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Uvažam %s kot %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Pregledujem %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Uvažam datoteke"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -14041,16 +14188,44 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Elm.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Zbriši to mapo"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Uvažam"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Uvažam datoteke"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Pregledujem %s"
+
+#: mail/importers/netscape-importer.c:72
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteta: %s"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14065,7 +14240,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14073,7 +14248,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14082,33 +14257,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#: mail/importers/netscape-importer.c:1995
+#: mail/importers/netscape-importer.c:1677
 #, fuzzy
-msgid "Scanning mail filters"
-msgstr "Krajevna datoteka s pošto %s"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Pregledujem mapo"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Pričenjam uvoz"
+msgid "Importing Netscape data"
+msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Uredi filtre"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14116,11 +14283,20 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Netscape.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolucija uvaža vaše podatke iz Pinea"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Uvažam datoteke"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adresar"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14128,7 +14304,7 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Program Pine"
 
@@ -14172,20 +14348,20 @@ msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pot:"
 
@@ -14238,29 +14414,44 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sestavi novo sporočilo"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Nova vMapa"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Uredi filtre"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Ustvari nov koledar"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identiteta"
 
@@ -14307,7 +14498,7 @@ msgstr ""
 "se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
 "interneta."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
@@ -14336,128 +14527,124 @@ msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Preveri za podprte vrste  "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL v tej zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
 msgstr "Račun %d"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
 msgstr "Dodaj nov podpis"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vedno pošlji _slepe kopije (Bcc) na:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vedno pošlji _kopije (Cc) na:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Neznan nabor znakov: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Zapri"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Strežnik dohodne pošte"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Preverjam za novo pošto"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Sestavljanje sporočil"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Nastavitev"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14474,323 +14661,319 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Privzeta prioriteta:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Mapa _osnutkov:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Poštni račun"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
 msgstr "_E-poštni naslov:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Izvrši ukaz..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se konča z"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Filtri"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
 msgstr "Lastnosti računa"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Glava"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Shrani in zapri"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
 msgstr "Naloži _slike"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
 msgstr "Prikaz _sporočila"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Sporočilo vsebuje"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Natisni izbrane stike"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Zapo_mni si to geslo"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odgovori-na:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Zapomni si geslo"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Varni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14798,16 +14981,16 @@ msgstr ""
 "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
 "\"domači\"."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -14818,200 +15001,200 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Ob prihodu nove pošte zapiskaj"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Zbriši vse razen podpisa"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
 msgstr "Vključi"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Posreduj naprej kot"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "junij"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odgovori vsem"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Zbriši..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Prvotni stik:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Pregledujem %s"
@@ -15034,7 +15217,7 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Delam"
 
@@ -15046,128 +15229,128 @@ msgstr "Mapa filtrov"
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Uvažam %s kot %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15176,7 +15359,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15185,11 +15368,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15198,22 +15381,22 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15248,39 +15431,39 @@ msgstr "šifriranje"
 msgid "Security Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Strežnik: %s, vrsta: %s:"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pot: %s, vrsta: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Pošlji in spreji pošto"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Prekliči vse"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Čakam..."
 
@@ -15394,20 +15577,20 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Poskus ureditve vmape '%s', ki ne obstaja."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
@@ -15755,99 +15938,20 @@ msgstr "Mapa filtrov"
 msgid "Autocompletion Folders"
 msgstr "Krajevne mape"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Ne morem kopirati mape: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Ne morem prestaviti mape: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Ne morem prestaviti mape nase."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Ne morem kopirati mape nase."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Ne morem kopirati mape v eno od naslednic."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Kopiraj mapo"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Prestavi mapo"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Nisem mogel zbrisati mape:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Zbriši mapo '%s'"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Nisem mogel preimenovati mape:\n"
+"Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Izbrano ime mape ni veljavno: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, fuzzy, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Nisem mogel preimenovati mape:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Ne morem ustvariti izbrane mape:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
@@ -15989,7 +16093,7 @@ msgstr "Nisem uspel dešifrirati sporočila"
 msgid "_Import"
 msgstr "Uvozi"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
@@ -16033,6 +16137,10 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Pričenjam uvoz"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16144,130 +16252,6 @@ msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Ustvari novo skupino bližnjic"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Ime skupine:"
-
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"Zares želite odstraniti skupino\n"
-"`%s' iz vrstice bližnjic?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Preimenuj skupino bližnjic"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Preimenuj izbrano skupino bližnjic v:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Majhne ikone"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Kaži bližnjice kot majhne ikone"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Velike ikone"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Kaži bližnjice kot velike ikone"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "_Nova skupina..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Ustvari novo skupino bližnjic"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Odstrani to skupino..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Odstrani to skupino bližnjic"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Preimenuj to skupino..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Preimenuj to skupino bližnjic"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Skrij vrstico z bližnjicami"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Skrij vrstico z bližnjicami"
-
-#: shell/e-shortcuts-view.c:288
-#, fuzzy
-msgid "Create _Default Shortcuts"
-msgstr "Ustvari novo bližnjico"
-
-#: shell/e-shortcuts-view.c:289
-#, fuzzy
-msgid "Create Default Shortcuts"
-msgstr "Ustvari novo bližnjico"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Preimenuj bližnjico"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Preimenuj izbrano bližnjico v:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Odpri mapo povezano s to bližnjico"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Odpri v novem _oknu"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Preimenuj to bližnjico"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Odstrani"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Odstrani to bližnjico iz vrstice bližnjic"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bližnjic."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Bližnjice"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -16278,11 +16262,6 @@ msgstr ""
 msgid "New"
 msgstr "Nov"
 
-#: shell/evolution-folder-selector-button.c:128
-#, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "%s ob %s"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16593,50 +16572,50 @@ msgstr ""
 "%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
 "  Uporabite %s --help za več podatkov.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Izberi mapo"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikata:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Napredek"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Izraz"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-poštni naslov:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ID _certifikata:"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Vpišite geslo za %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
@@ -16645,7 +16624,7 @@ msgstr ""
 "Proizvedel: %s\n"
 "Zadeva: %s"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -16712,7 +16691,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "ID _certifikata:"
@@ -16786,11 +16765,11 @@ msgstr "Organizacija"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16838,242 +16817,242 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID vizitke že obstaja"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "V redu"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Javni ključ: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Zadeva je %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 #, fuzzy
 msgid "Object Signer"
 msgstr "_Predmet"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "dohodna"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ni podatkov"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "priloga"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Hrvaška"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Izraz"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s ob %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Vstavi"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Zadeva je %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Vpišite geslo za %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "ID _certifikata:"
@@ -17689,7 +17668,8 @@ msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Pošiljatelja _dodaj v adresar"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17697,7 +17677,8 @@ msgid "A_pply Filters"
 msgstr "_Uveljavi filtre"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Pošiljatelja dodaj v adresar"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18154,10 +18135,6 @@ msgstr "O_blika"
 msgid "HT_ML"
 msgstr "H_TML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Odpri"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Odpri datoteko"
@@ -18535,22 +18512,6 @@ msgstr "_Oddaja / sprejem"
 msgid "_Window"
 msgstr "_Išči sedaj"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Natisni povzetek"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Natisni povzetek"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Znova naloži"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Znova naloži ta pogled"
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -18626,8 +18587,8 @@ msgstr "S kategorijo"
 msgid "_Tasks"
 msgstr "_Naloga"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18878,26 +18839,26 @@ msgstr "I_skanje"
 msgid "_Find Now"
 msgstr "_Išči sedaj"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 #, fuzzy
 msgid "_Clear"
 msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 #, fuzzy
 msgid "Item ID"
 msgstr "_Predmet (FIXME)"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 #, fuzzy
 msgid "Text"
 msgstr "Preizkus"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Išči sedaj"
@@ -18912,6 +18873,214 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Viri adresarja"
+
+#, fuzzy
+#~ msgid "No data provided"
+#~ msgstr "Ime datoteke ni navedeno."
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne morem odpreti datoteke '%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel ustvariti imenika %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel ustvariti datoteke `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' ni imenik."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Uvažam %s kot %s"
+
+#, fuzzy
+#~ msgid "Scanning mail filters"
+#~ msgstr "Krajevna datoteka s pošto %s"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Pregledujem mapo"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Ne morem kopirati mape: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Ne morem prestaviti mape: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Ne morem prestaviti mape nase."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Ne morem kopirati mape nase."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Ne morem kopirati mape v eno od naslednic."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Kopiraj mapo"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Prestavi mapo"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel zbrisati mape:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Zbriši mapo '%s'"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel preimenovati mape:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel preimenovati mape:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Ustvari novo skupino bližnjic"
+
+#~ msgid "Group name:"
+#~ msgstr "Ime skupine:"
+
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Zares želite odstraniti skupino\n"
+#~ "`%s' iz vrstice bližnjic?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Preimenuj skupino bližnjic"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Preimenuj izbrano skupino bližnjic v:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Majhne ikone"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Kaži bližnjice kot majhne ikone"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Velike ikone"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Kaži bližnjice kot velike ikone"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "_Nova skupina..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Ustvari novo skupino bližnjic"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Odstrani to skupino..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Odstrani to skupino bližnjic"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Preimenuj to skupino..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Preimenuj to skupino bližnjic"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Skrij vrstico z bližnjicami"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Skrij vrstico z bližnjicami"
+
+#, fuzzy
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Ustvari novo bližnjico"
+
+#, fuzzy
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Ustvari novo bližnjico"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Preimenuj bližnjico"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Preimenuj izbrano bližnjico v:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Odpri mapo povezano s to bližnjico"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Odpri v novem _oknu"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Preimenuj to bližnjico"
+
+#~ msgid "Re_move"
+#~ msgstr "_Odstrani"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Odstrani to bližnjico iz vrstice bližnjic"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Napaka ob shranjevanju bližnjic."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Bližnjice"
+
+#, fuzzy
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "%s ob %s"
+
+#~ msgid "Print Summary"
+#~ msgstr "Natisni povzetek"
+
+#~ msgid "Print summary"
+#~ msgstr "Natisni povzetek"
+
+#~ msgid "Reload"
+#~ msgstr "Znova naloži"
+
+#~ msgid "Reload the view"
+#~ msgstr "Znova naloži ta pogled"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopiraj v mapo..."
 
@@ -19538,21 +19707,9 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Drug naslov"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolucijin uvozni druid"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Evolucijin uvozni druid"
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolucijin setavljalnik pošte."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolucijin setavljalnik pošte."
-
 #~ msgid "Searching..."
 #~ msgstr "Iščem..."
 
@@ -20993,10 +21150,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Appointments"
 #~ msgstr "Sestanki"
 
-#, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Ni sestankovov"
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -21501,9 +21654,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Moderate mist"
 #~ msgstr "Zmerne meglice"
 
-#~ msgid "Thick mist"
-#~ msgstr "Goste meglice"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Plitve meglice"
 
@@ -22039,9 +22189,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Ustvari novo mapo"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Zbriši to mapo"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Pokaži drugo mapo"
 
@@ -25604,9 +25751,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Odpiram sporočila iz  mape \"%s\""
 
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Odpri sporočilo iz \"%s\""
-
 #~ msgid "Viewing messages from folder \"%s\""
 #~ msgstr "Gledam sporočilo iz mape \"%s\""
 
diff --git a/po/sq.po b/po/sq.po
index a3d589449e..5425cad8a4 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -48,8 +48,7 @@ msgstr "Konfiguro këtu plotësimin automatik"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -89,19 +88,20 @@ msgstr "Kontrolli i konfigurimit të rregullimit të kartelave të Evolution"
 msgid "Manager your S/Mime certificates here"
 msgstr "Manazho këtu çertifikatat tuaja S/Mime"
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Rubrikë e re"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -109,65 +109,65 @@ msgstr "Rubrikë e re"
 msgid "Delete"
 msgstr "Elemino"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Pronësitë..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Kontakt i Ri"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Krijo një kontakt të ri"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Lista e re kontaktesh"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Lista e kontakteve"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Krijo një listë të re kontektesh"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Lidhja me server-in LDAP dështoi"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Identifikimi me server-in LDAP dështoi"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "E pamundur kryerja e kërkesave tek DSE Root"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Gabim gjatë tërheqjes së informacionit të skemës"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Duke ngarkuar..."
@@ -181,41 +181,43 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Në këtë kompjuter"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personale"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "Në server-ët LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Në server-ët LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Plotësim automatik"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -228,7 +230,7 @@ msgstr ""
 "rikonfiguro limitin e rezultateve tek preferimet e server-it të directory\n"
 "për këtë libër adresash."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -242,21 +244,21 @@ msgstr ""
 "directory\n"
 "për këtë libër adresash."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Kjo kërkesë nuk u plotësua me sukses."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -265,7 +267,7 @@ msgstr ""
 "Nuk arrijmë të hapim këtë libër adresash.  Kontrollo që pozicioni\n"
 "ekziston dhe që keni të drejtën të futeni në të."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -275,7 +277,7 @@ msgstr ""
 "që është dhënë një URI e pasaktë, ose që server-i LDAP\n"
 "nuk është i arritshëm."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -287,7 +289,7 @@ msgstr ""
 "t'a kompiloni programin nga buruesit CVS mbasi të keni shkarkuar\n"
 "OpenLDAP nga lidhja e mëposhtme.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -297,27 +299,32 @@ msgstr ""
 "që është dhënë një URI e pasaktë, ose që server-i LDAP\n"
 "nuk është i arritshëm."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "E pamundur hapja e librit të adresave"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hyrje anonime tek server-i LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Autentifikimi dështoi.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI që do të shfaqë kalendari"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -363,7 +370,7 @@ msgstr "  S_hfaq bazat e suportuara "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -395,20 +402,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Asistenti i krijimit të rubrikës"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Buruesit e Librit të Adresave"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Buruesit e Librit të Adresave"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Burimet e rubrikës..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Gjithmonë"
 
@@ -419,7 +428,8 @@ msgstr "Anonimisht"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -427,51 +437,51 @@ msgstr ""
 "\n"
 "Ju lutem kliko tek butoni \"Fund\" për të ruajtur rregullimet që sapo kryet."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Duke lidhur"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_Emri dallues:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "Adresa Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Mbaruam"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Të përgjithshme"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grupi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Asnjëherë"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -487,23 +497,23 @@ msgstr ""
 "Pyesni administratorin tuaj të sistemit se server-i juaj LDAP përdor këta "
 "protokollë."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Një"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "F_usha e kërkimit: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Duke kërkuar"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Zgjedhur:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -513,7 +523,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -531,7 +541,7 @@ msgstr ""
 "është e\n"
 "sigurtë."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -545,7 +555,7 @@ msgstr ""
 "jeni i pambrojtur ndaj\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -556,43 +566,45 @@ msgstr ""
 "prezgjedhura të Evolution\n"
 "për kërkimet LDAP, dhe për krijimin e ndryshimin e kontakteve. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Specifikimi i emrit të shfaqur dhe grupit është hapi i parë në konfigurimin "
 "e një rubrike adresash."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Hapi 1: Informacione mbi server-in"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Hapi 2: lidhja me server-in"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Hapi 3: kërkimi i directory"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -606,7 +618,7 @@ msgstr ""
 "sistemit nëse\n"
 "keni nevojë të ndryshoni këto opcione."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -618,7 +630,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -633,12 +645,13 @@ 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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -649,7 +662,7 @@ msgstr ""
 "në lidhje me server-in. Lidhuni me administratorin e sistemit tuaj nëse keni "
 "nevojë për ndihmë për të gjetur këto informacione."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -657,17 +670,18 @@ 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Ky është numri maksimum i zërave për tu shkarkuar. Duke e vendosur këtë "
 "numër \n"
 "tepër të madh do të ngadalsoni në menyrë të ndjeshme rubrikën tuaj."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -677,7 +691,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -686,7 +700,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -696,7 +710,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:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -709,28 +723,28 @@ msgstr ""
 "tuaj të sistemit\n"
 "se çfarë porte duhet të përdorni."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Pë_rdor SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Duke përdorur emër të përveçëm (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Duke përdorur adresën email"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Sa herë të jetë e mundur"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -744,19 +758,19 @@ msgstr ""
 "sistemit nëse nuk jeni të sigurt\n"
 "mbi këto informacione."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Emri i _dukshëm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "Limiti i _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -765,39 +779,39 @@ msgstr "Limiti i _download:"
 msgid "_Edit"
 msgstr "_Ndrysho"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Metoda e _identifikimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "Numri i _portës:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Emri i _server-it:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (në minuta):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "gjuhëza-lidhjes"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "gjuhëza-e përgjithshme"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "gjuhëza-kërkimit"
 
@@ -920,7 +934,7 @@ msgstr "Bashkpunim"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Editori i kontakteve"
 
@@ -1014,10 +1028,10 @@ msgstr "_Kategoritë..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1065,15 +1079,15 @@ msgid "_Web page address:"
 msgstr "Adresa e faqes _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2064,107 +2078,115 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Buruesi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Pozicioni:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Riemërto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Shtëpi"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Punësim"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Tjetër"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Buruesi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontakt i Ri"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Fusha të ndryshueshme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Ndryshuar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Editori i kategorive nuk është disponibël."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Ky kontak u takon këtyre kategorive:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Ruaj kontaktin si VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2172,7 +2194,7 @@ msgstr ""
 "Jeni i sigurt që dëshiron\n"
 "të eleminosh këto kontakte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2180,46 +2202,51 @@ msgstr ""
 "Jeni i sigurt që dëshiron\n"
 "të eleminosh këtë kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Zyrë"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupi"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Shtimi i shpejtë i një kontakti"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "Ndrysho _plotësisht"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "Emri dhe _mbiemri:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
@@ -2378,11 +2405,11 @@ msgid "Is New List"
 msgstr "Është një listë e re"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Editori i listës së kontakteve"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Ruaje listën si VCard"
 
@@ -2473,13 +2500,13 @@ msgid "Email begins with"
 msgstr "Email fillon me"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategoria është"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Çfarëdo fushe që përmban"
 
@@ -2496,101 +2523,101 @@ msgid "Type"
 msgstr "Lloji"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Rubrika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ruaje si VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Kontakt i ri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Listë e re kontaktesh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Shko tek kartela..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Kërko për kontaktet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Burimet e rubrikës..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Rregullimet Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Përcill kontaktin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Dërgo një mesazh tek kontakti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Printo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Printo zarfin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Rubrika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Rubrika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Prije"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopjo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Ngjit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Paraqitja aktuale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2602,8 +2629,8 @@ 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:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Çdo kategori"
 
@@ -2646,7 +2673,7 @@ msgid "Company Phone"
 msgstr "Telefoni i ndërmarrjes"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2708,7 +2735,7 @@ msgid "Nickname"
 msgstr "Nickname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Shënim"
 
@@ -2717,7 +2744,7 @@ msgid "Office"
 msgstr "Zyrë"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organizata"
 
@@ -2845,68 +2872,74 @@ msgstr "I zgjedhur"
 msgid "Has Cursor"
 msgstr "Ka kursorin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Anëtarë"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Punësim"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Përshkrimi:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Telefoni në makinë"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personale"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Titulli:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax në shtëpi"
@@ -2916,8 +2949,8 @@ msgid "Success"
 msgstr "Në rregull"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2949,7 +2982,7 @@ msgstr "Protokoll i pasuportuar"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2969,7 +3002,8 @@ msgid "TLS not Available"
 msgstr "TLS jo në dispozicion"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Rubrika nuk ekziston"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3111,7 +3145,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Shtoja adresën një kontakti ekzistues \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Duke konsultuar Librin e Adresave..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3169,18 +3204,41 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Alarmi i Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Shfaqësi i kalendarit të Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Printo cards"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Gjej kontaktin në"
@@ -3273,7 +3331,7 @@ msgstr "Kufijtë"
 msgid "Number of columns:"
 msgstr "Numri i kollonave:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcione"
 
@@ -3456,8 +3514,8 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Listë pa emër"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Password"
@@ -3539,10 +3597,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Aktivitete"
 
@@ -3586,26 +3643,24 @@ msgstr "Zilja (në minuta)"
 msgid "_Edit appointment"
 msgstr "_Ndrysho takimet"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Hap"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Hap"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Asnjë përshkrim."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3614,12 +3669,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Kujdes"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3631,7 +3686,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3648,19 +3703,19 @@ msgstr ""
 "\n"
 "Dëshironi me të vërtetë që ky program të ekzekutohet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "E pamundur nisja e Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "E pamundur nisja e gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 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 "
@@ -3805,24 +3860,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Shfaq _numrat e javëve"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Përmbledhja përmban"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Përshkrimi përmban"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komenti përmban"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Përshkrimi përmban"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Jo korrispondues"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendari"
 
@@ -3849,7 +3910,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3871,75 +3932,75 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Takim i ri"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Takim"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Krijo një takim të ri"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Mbledhje e re"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "Mbl_edhje"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Krijo një kërkesë të re për mbledhje"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Takim i ri i përditshëm"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Takim i _përditshëm"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Krijo një takim të ri të përditshëm"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendari:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Krijo një kontakt të ri"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4074,7 +4135,7 @@ msgstr "orë"
 msgid "minutes"
 msgstr "minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4148,7 +4209,7 @@ msgid "hour(s)"
 msgstr "orë"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutë(a)"
 
@@ -4159,7 +4220,7 @@ msgstr "fillimit të takimit"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -4213,7 +4274,7 @@ msgstr "30 minuta"
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alarme"
 
@@ -4238,7 +4299,7 @@ msgid "Days"
 msgstr "Ditët"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr ""
 
@@ -4381,7 +4442,7 @@ msgid "_Fri"
 msgstr "_Pre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_E përgjithshme"
 
@@ -4480,7 +4541,7 @@ msgstr ""
 "Ju lutem kliko tek butoni \"Fund\" për të ruajtur rregullimet që sapo kryet."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista e aktiviteteve"
@@ -4654,23 +4715,23 @@ msgstr "%s  Nuk keni kryer ndryshime, rifreskoj editorin?"
 msgid "Validation error: %s"
 msgstr "Gabim gjatë vleftësimit: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " për "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (U plotësua "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "U plotësua"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Skadimi "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Skadimi "
 
@@ -4706,8 +4767,8 @@ msgstr "Zë i ditarit - %s"
 msgid "No summary"
 msgstr "Asnjë përmbledhje"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Ruaje si..."
 
@@ -4738,9 +4799,20 @@ msgstr "E pamundur hapja e kartelës tek '%s'"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
-msgstr ""
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Zgjidh një veprim"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalendari"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Aktivitet i ri"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4848,7 +4920,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr ""
 
@@ -4872,23 +4944,31 @@ msgstr ""
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nuk ke të drejtë të hapësh kalendarin"
@@ -4968,29 +5048,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Asnjë"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr ""
 
@@ -5182,7 +5262,7 @@ msgstr ""
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Ora:"
@@ -5218,7 +5298,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Hiq"
 
@@ -5257,7 +5337,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5281,7 +5361,7 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -5294,7 +5374,7 @@ msgstr "U kompletua"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "I përfunduar"
 
@@ -5307,7 +5387,7 @@ msgstr "E lartë"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Në zhvillim"
 
@@ -5326,7 +5406,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Për t'u filluar"
 
@@ -5368,16 +5448,16 @@ msgstr "Të përgjithshme"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "E pamundur hapja e librit të adresave"
@@ -5388,7 +5468,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Përshkrimi:"
 
@@ -5580,11 +5660,10 @@ msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Përmbledhja"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr ""
 
@@ -5609,7 +5688,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -5644,10 +5723,10 @@ msgstr "Jo"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "E panjohur"
@@ -5660,99 +5739,105 @@ msgstr ""
 msgid "Assigned"
 msgstr "Caktuar"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Printo..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Ngjite"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Hap"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopjo"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
@@ -5839,7 +5924,7 @@ msgid "Alarms"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "U kompletua"
 
@@ -5894,26 +5979,26 @@ 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr ""
@@ -6094,7 +6179,7 @@ msgid "Send Latest Information"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anullo"
@@ -6551,12 +6636,12 @@ msgstr "Prioriteti i prezgjedhur:"
 msgid "Web Page:"
 msgstr "Faqja"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6564,7 +6649,7 @@ msgid ""
 msgstr ""
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6572,41 +6657,51 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Gabim gjatë ruajtjes së %s: %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Duke ngarkuar..."
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Duke ngarkuar..."
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Takimi - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6725,16 +6820,16 @@ msgstr ""
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6742,7 +6837,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6750,12 +6845,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6944,49 +7039,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr ""
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Pamja e parë e printimit"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr ""
 
@@ -6995,39 +7090,39 @@ msgstr ""
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Aktivitet i ri"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Aktivitet"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Krijo një aktivitet të ri"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Aktivitet i ri"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Lista e aktiviteteve"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Krijo një aktivitet të ri"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7080,26 +7175,26 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Kartelë publike që përmban takime dhe ngjarje"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr ""
 
@@ -8755,7 +8850,7 @@ msgstr ""
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr ""
 
@@ -8836,7 +8931,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8844,45 +8939,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr ""
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8890,58 +8981,58 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr ""
 
@@ -9051,21 +9142,34 @@ msgstr ""
 msgid "parse error"
 msgstr ""
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonim"
@@ -9204,7 +9308,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9335,20 +9439,7 @@ msgstr ""
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9412,21 +9503,25 @@ msgstr ""
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Koshi"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9635,21 +9730,31 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9665,15 +9770,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Rubrika"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9693,68 +9793,66 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Password"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "E prezgjedhur"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "lista"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Operacioni u anullua"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -9769,7 +9867,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
@@ -9778,12 +9876,12 @@ msgstr ""
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9797,25 +9895,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9873,27 +9971,35 @@ msgstr ""
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9902,65 +10008,65 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9968,24 +10074,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10006,7 +10120,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Lidhja me server-in LDAP dështoi"
@@ -10085,8 +10199,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10098,55 +10212,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -10164,49 +10278,44 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
 #, c-format
-msgid "Folder `%s' does not exist."
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:134
 #, c-format
-msgid "`%s' is not a maildir directory."
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10228,9 +10337,9 @@ msgid "Checking for new messages"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr ""
@@ -10272,150 +10381,134 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-store.c:170
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr "E pamundur hapja e kartelës tek '%s'"
-
-#: camel/providers/local/camel-mbox-store.c:182
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:206
 #, c-format
-msgid "`%s' is not a regular file."
+msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
-msgid "Folder `%s' is not empty. Not deleted."
+msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
+#: camel/providers/local/camel-mbox-store.c:262
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID e card ekziston"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Nuk është specifikuar emri i kartelës."
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -10429,10 +10522,15 @@ msgstr ""
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10454,6 +10552,25 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10678,46 +10795,46 @@ msgstr ""
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Hapi 2: lidhja me server-in"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 msgid "Could not get messages: unspecificed error"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -10764,7 +10881,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -10844,7 +10961,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -10896,7 +11013,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr ""
 
@@ -11059,7 +11176,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr ""
 
@@ -11165,34 +11282,34 @@ msgstr ""
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11306,82 +11423,82 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11389,49 +11506,49 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Hap file"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11439,13 +11556,13 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11782,7 +11899,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr ""
@@ -11795,19 +11912,19 @@ msgid ""
 msgstr ""
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "I rëndësishëm"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr ""
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr ""
 
@@ -11889,7 +12006,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr ""
 
@@ -11905,7 +12022,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekonda"
 
@@ -12075,7 +12192,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "Qershor"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketë"
@@ -12183,9 +12300,10 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr ""
 
@@ -12193,25 +12311,25 @@ msgstr ""
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr ""
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr ""
 
@@ -12259,15 +12377,15 @@ msgstr "Përmbledhja përmban"
 msgid "Subject does not contain"
 msgstr "Komenti përmban"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr ""
 
@@ -12316,9 +12434,9 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Posta"
 
@@ -12326,7 +12444,7 @@ msgstr "Posta"
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr ""
 
@@ -12364,15 +12482,15 @@ msgstr ""
 msgid "[script]"
 msgstr ""
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr ""
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr ""
 
@@ -12448,7 +12566,6 @@ msgid "Unread messages"
 msgstr "Mesazhi"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -12456,381 +12573,397 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Duke ngarkuar..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr ""
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Hape në një dritare të re"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "_Lëviz..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Riemërto"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Pronësitë...."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Printo"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Vazhdo"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "E prezgjedhur"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Jo korrispondues"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Caktuar"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Argumente të pavlefshme"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "E pa përcaktuar"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Aktivitete të skaduara:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Fshih"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
@@ -12873,29 +13006,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr ""
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Manazhuesi i postës"
 
@@ -12909,8 +13047,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -12927,20 +13065,25 @@ msgstr ""
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Operacion i pasuportuar"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Gabim gjatë ndryshimit të card"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12952,60 +13095,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Save As..."
 msgstr "Ruaje _si..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hape në një dritare të re"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Dërgo një mesazh tek kontakti"
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Rubrika"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -13051,56 +13194,62 @@ msgstr "Filtra"
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Mesazhi"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr ""
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "_Kërko në mesazh..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Adresa"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Opcionet e alarmit me mesazh"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13109,7 +13258,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13130,300 +13279,308 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:11
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Prioriteti i prezgjedhur:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Bëj të padukshëm panelin e shtigjeve"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Server-i i prezgjedhur i kalendarit"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Bëj të padukshëm panelin e shtigjeve"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Bëj të padukshëm panelin e shtigjeve"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Dërgoj postën në HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Dërgoj postën në HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Shfaq kontektet"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Kontakti origjinal:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13431,183 +13588,208 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importim"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr ""
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr ""
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importo..."
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Lëvize tek kartela..."
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importo..."
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Importo..."
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13622,7 +13804,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13630,7 +13812,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13639,47 +13821,48 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr ""
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
+#: mail/importers/netscape-importer.c:1677
+msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Rregullimet"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importo..."
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Rubrika"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr ""
 
@@ -13719,19 +13902,19 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr ""
 
@@ -13780,28 +13963,42 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+msgid "New Mail Folder"
+msgstr ""
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "_Kartela:"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Krijo një kontakt të ri"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI që do të shfaqë kalendari"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr ""
 
@@ -13836,7 +14033,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr ""
 
@@ -13858,119 +14055,114 @@ msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bashkangjitur"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Identifikimi"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "N_gjyra"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfigurimi"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13980,480 +14172,476 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "U plotësua"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Filtra"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Kreu i faqes"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Konfigurimi i Mail"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Zgjidh një ngjyrë"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Qershor"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Emri:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "I zgjedhur"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "përshkrimi"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14472,7 +14660,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr ""
 
@@ -14484,168 +14672,168 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14680,38 +14868,38 @@ msgstr "përshkrimi"
 msgid "Security Information"
 msgstr "Informacione"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr ""
 
@@ -14811,20 +14999,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr ""
 
@@ -15144,89 +15332,18 @@ msgstr ""
 msgid "Autocompletion Folders"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
@@ -15353,7 +15470,7 @@ msgstr "E pamundur marrja e versionit aktual!"
 msgid "_Import"
 msgstr "Importim"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr ""
 
@@ -15391,6 +15508,10 @@ msgstr ""
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15499,123 +15620,6 @@ msgstr "Nuk u gjet databaza e konfigurimit "
 msgid "Generic error"
 msgstr "Gabim i përgjithshëm"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Krijo një grup të ri shtigjesh"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Emri i grupit:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Me të vërtetë dëshiron të heqësh grupin \"%s\" nga paneli i shtigjeve?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Ndrysho emrin e grupit të shtigjeve"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Riemërto emrin e grupit të zgjedhur në:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Ikona të _vogla"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Paraqit shtigjet si ikona të vogla"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Ikona të _mëdha"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Paraqit shtigjet si ikona të mëdha"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Shto një grup..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Krijo një grup të ri shtigjesh"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Elemino këtë grup..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Fshi këtë grup shtigjesh"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Ri_emërto këtë grup..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Ndrysho emrin e këtij grupi shtigjesh"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Fshih panelin e shtigjeve"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Bëj të padukshëm panelin e shtigjeve"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Krijo shtigjet e _prezgjedhur"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Krijo shtigjet e prezgjedhur"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr ""
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Hiq"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr ""
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr ""
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Tastet e Shpejtë"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15626,11 +15630,6 @@ msgstr ""
 msgid "New"
 msgstr "E re"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -15888,55 +15887,55 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Zgjidh një veprim"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Progresi"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Bashko adresën E-Mail"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15999,7 +15998,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr ""
 
@@ -16068,11 +16067,11 @@ msgstr "Njësia organizative"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16118,221 +16117,221 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID e card ekziston"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d %B %Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Pyetje"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "S"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Kroaci"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Përmasat:"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "Aktiviteti - %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Shto"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
@@ -16924,16 +16923,18 @@ msgid "_Threaded Message List"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "Rubrika"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Rubrika"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17379,10 +17380,6 @@ msgstr ""
 msgid "HT_ML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Hap"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Hap një file"
@@ -17748,22 +17745,6 @@ msgstr ""
 msgid "_Window"
 msgstr ""
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr ""
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Ringarko"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17828,8 +17809,8 @@ msgstr ""
 msgid "_Tasks"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18070,23 +18051,23 @@ msgstr "_Kërko"
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Pastro"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Teksti"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Gjej"
@@ -18101,6 +18082,86 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Buruesit e Librit të Adresave"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Krijo një grup të ri shtigjesh"
+
+#~ msgid "Group name:"
+#~ msgstr "Emri i grupit:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "Me të vërtetë dëshiron të heqësh grupin \"%s\" nga paneli i shtigjeve?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Ndrysho emrin e grupit të shtigjeve"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Riemërto emrin e grupit të zgjedhur në:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Ikona të _vogla"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Paraqit shtigjet si ikona të vogla"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Ikona të _mëdha"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Paraqit shtigjet si ikona të mëdha"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Shto një grup..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Krijo një grup të ri shtigjesh"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Elemino këtë grup..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Fshi këtë grup shtigjesh"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Ri_emërto këtë grup..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Ndrysho emrin e këtij grupi shtigjesh"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Fshih panelin e shtigjeve"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Bëj të padukshëm panelin e shtigjeve"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Krijo shtigjet e _prezgjedhur"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Krijo shtigjet e prezgjedhur"
+
+#~ msgid "Re_move"
+#~ msgstr "_Hiq"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Tastet e Shpejtë"
+
+#~ msgid "Reload"
+#~ msgstr "Ringarko"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopjoje tek kartela..."
 
@@ -18175,9 +18236,6 @@ msgstr ""
 #~ "Shkruaj një emër ose zgjidh\n"
 #~ "një nga lista e mëposhtme:"
 
-#~ msgid "_Folder:"
-#~ msgstr "_Kartela:"
-
 #~ msgid "East Timor"
 #~ msgstr "East Timor"
 
diff --git a/po/sr.po b/po/sr.po
index 532dae452c..e3449d3388 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-01 17:54+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-03-01 18:28+0100\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.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"
 
@@ -49,7 +49,6 @@ msgstr "Подесите овде самодопуњавање"
 #. 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:363
@@ -93,19 +92,19 @@ msgstr "Управљање подешавањем директоријума и�
 msgid "Manager your S/Mime certificates here"
 msgstr "Овде управљајте вашим S/MIME сертификатима"
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Адресар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
 
-#: addressbook/gui/component/addressbook-component.c:269
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: addressbook/gui/component/addressbook-component.c:270
+#: addressbook/gui/component/addressbook-component.c:309
 #: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -113,60 +112,60 @@ msgstr "Нови адресар"
 msgid "Delete"
 msgstr "Обриши"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Особине..."
 
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Нови контакт"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Унеси нови контакт"
 
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Нова контакт листа"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Списак контаката"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Направи нови списак контаката"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Неуспешно повезивање са LDAP сервером"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Неуспешна пријава на LDAP сервер"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Нисам могао да обавим упит на Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Сервер је одговорио неподржаним базама за претрагу"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Овај сервер не подржава податке LDAPv3 шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Грешка у читању података шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Сервер није одговорио са исправним подацима шеме"
 
@@ -194,20 +193,18 @@ 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:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "На овом рачунару"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Лично"
 
@@ -363,7 +360,7 @@ msgstr " П_окажи подржане базе "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -407,7 +404,7 @@ msgid "Address Book Sources"
 msgstr "Извори адресара"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Увек"
 
@@ -467,7 +464,7 @@ msgid "Group:"
 msgstr "Група:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Никада"
 
@@ -711,7 +708,7 @@ msgid "Using email address"
 msgstr "Користим електронску адресу"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Када је могуће"
 
@@ -739,7 +736,7 @@ msgstr "Лимит за _преузимање:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -989,9 +986,9 @@ msgstr "Ка_тегорије..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2200
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
 #: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -2083,7 +2080,7 @@ msgstr "Кућа"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Посао"
 
@@ -2446,13 +2443,13 @@ msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорија је"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
@@ -2542,7 +2539,7 @@ msgstr "Исеци"
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:360
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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
@@ -2573,7 +2570,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1607
-#: calendar/gui/cal-search-bar.c:353
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Било која категорија"
 
@@ -3106,17 +3103,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 "Сва права задржана ©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 "Ово испробава преиспуњавање поља"
 
@@ -3242,7 +3239,7 @@ msgstr "Маргине"
 msgid "Number of columns:"
 msgstr "Број колона:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Опције"
 
@@ -3422,7 +3419,7 @@ msgstr "Име датотеке није дато."
 msgid "Unnamed List"
 msgstr "Листа без имена"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
 #: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Унесите лозинку"
@@ -3500,7 +3497,7 @@ msgid "Evolution's Tasks component"
 msgstr "Део Еволуције за задужења"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3758,23 +3755,30 @@ msgstr "Да ли да приказујем време у 24ч облику ум
 msgid "Whether to show week numbers in date navigator"
 msgstr "Да ли да приказује бројеве недеља у избирачу датума"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Коментар садржи"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Опис садржи"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Нерасподељено"
 
 #: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3804,10 +3808,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:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -3831,70 +3831,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Календар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
 
-#: calendar/gui/calendar-component.c:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Нови заказани састанак"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "Заказани _састанак"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Закажи састанак"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Сачини нови захтев за састанак"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Нови целодневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Цело_дневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Сачини нови целодневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Нови календар"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "К_алендар"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Направи нови календар"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не могу да отворим календар „%s“ ради прављења догађаја и састанака"
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема доступног календара за прављење догађаја и састанака"
 
@@ -4028,7 +4028,7 @@ msgstr "сати"
 msgid "minutes"
 msgstr "минута"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Дејство/покрени"
 
@@ -4101,7 +4101,7 @@ msgstr "сат(а)"
 
 # bug:plural-forms
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "минут(а)"
 
@@ -4163,7 +4163,7 @@ msgstr "30 минута"
 msgid "60 minutes"
 msgstr "60 минута"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Упозорења"
 
@@ -4188,7 +4188,7 @@ msgid "Days"
 msgstr "Дани"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "О_могући"
 
@@ -4328,7 +4328,7 @@ msgid "_Fri"
 msgstr "_Пет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Опште"
 
@@ -4812,23 +4812,32 @@ msgstr "Заказивање"
 msgid "Meeting"
 msgstr "Састанак"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Датум завршетка је пре датума почетка!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Почетни датум је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Крајњи датум је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Почетно време је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Крајње време је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не могу да отворим календар „%s“."
@@ -4902,36 +4911,31 @@ msgid "_Start time:"
 msgstr "_Почетно време:"
 
 #. 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:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ништа"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Изабрани организатор више нема налог."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Захтева организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Најмање један присутни је потребан."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Делегирај за..."
 
@@ -5119,7 +5123,7 @@ msgstr "на"
 msgid "occurrences"
 msgstr "појаве"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -5152,7 +5156,7 @@ msgid "_No recurrence"
 msgstr "_Без понављања"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -5218,7 +5222,7 @@ msgstr "Информација о примљеном задужењу је са�
 msgid "The task information has changed. Send an updated version?"
 msgstr "Информација о задужењу је измењена. Да пошаљем новију верзију?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
@@ -5302,16 +5306,16 @@ msgstr "Основно"
 msgid "Assignment"
 msgstr "Задатак"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Датум за завршетак је погрешан"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Датум завршетка је пре датума почетка!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не могу да отворим задужења у „%s“."
@@ -5322,7 +5326,7 @@ msgstr "Пов_ерљиво"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Опис:"
 
@@ -5519,7 +5523,7 @@ msgstr "Почетни датум"
 msgid "Summary"
 msgstr "Извештај"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "боја"
 
@@ -5582,7 +5586,7 @@ msgstr "Не"
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Непознато"
@@ -5671,7 +5675,7 @@ msgstr "_Исеци"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5780,7 +5784,7 @@ msgid "Alarms"
 msgstr "Аларми"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Завршено"
 
@@ -5809,20 +5813,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5846,10 +5842,6 @@ msgstr "%02i минутни размаци"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5857,9 +5849,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-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6061,7 +6050,7 @@ msgid "Send Latest Information"
 msgstr "Пошаљи најновију информацију"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Одустани"
@@ -6423,10 +6412,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-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
@@ -6435,10 +6420,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:1606
 msgid "%m/%d/%Y"
@@ -6527,7 +6508,7 @@ msgstr "Веб страница:"
 msgid "Click to open %s"
 msgstr "Кликните да отворите %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6537,7 +6518,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6548,12 +6529,12 @@ msgstr ""
 "%s\n"
 " је пукла."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварам задужења у %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6562,19 +6543,19 @@ msgstr ""
 "Грешка при отварању %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Учитавам задужења"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Испуњавам задужења..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Бришем изабране објекте..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Избацујем"
 
@@ -6714,11 +6695,11 @@ msgstr "Слободан/заузет информација (%s до %s)"
 msgid "iCalendar information"
 msgstr "iCalendar информација"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Унесите лозинку за „%s“"
@@ -8788,7 +8769,7 @@ msgstr "Неисправни аргументи за (системска-озн�
 msgid "Invalid arguments to (user-tag)"
 msgstr "Неипсравни аргументи за (корисничка-ознака)"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка код примене филтера за претрагу: %s: %s"
@@ -8877,7 +8858,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Поништено."
 
@@ -9254,7 +9235,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Лош одговор на пријаву од сервера."
 
@@ -9467,11 +9448,11 @@ msgstr "Не могу да направим директоријум: неисп
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не могу да обришем директоријум: %s: неисправна операција"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Смеће"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Ђубре"
@@ -9741,7 +9722,7 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Примени филтере на нове поруке у Inbox-у овог сервера"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Аутоматски усклади удаљену пошту са локалном"
 
@@ -9762,37 +9743,35 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "За приступ Новел Групвајз серверима"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Лозинка"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Подразумевани"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "Операција обустављена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Веза са сервером је неочекивано искључена: %s"
@@ -9841,21 +9820,21 @@ msgstr "Нисам могао да направим директоријум %s:
 msgid "Could not load summary for %s"
 msgstr "Нисам могао да учитам сажетак за %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 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:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Трагам за промењеним порукама"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Не могу да покупим поруку: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9871,25 +9850,25 @@ msgstr ""
 "Не могу да добијем поруку: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ова поруке није тренутно доступна"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Прикупљам сажету информацију за нове поруке"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Нисам могао да пронађем текст поруке у FETCH одговору."
 
@@ -9944,27 +9923,37 @@ msgstr "Формат имена"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Примени филтере на нове поруке у INBOX-у овог сервера"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Провери за нове поруке у свим директоријумима"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Провери за нове поруке у свим директоријумима"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За читање и смештање поште на IMAP сервере."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP сервер %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP сервис за %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9973,64 +9962,64 @@ msgstr "IMAP сервис за %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Нисам могао да се повежем на %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS екстензија није подржана."
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL преговори нису успели"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Нисам могао да се повежем помоћу наредбе %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не подржава тражени тип пријаве  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Нисте унели лозинку."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10041,13 +10030,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Нема таквог директоријума %s"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10055,18 +10044,18 @@ msgstr "Нема таквог директоријума %s"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не могу да направим директоријум „%s“: директоријум постоји."
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Име директоријума \"%s\" није исправно јер садржи карактер \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Непознати главни директоријум: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Главни директоријум не може садржати директоријуме у себи"
 
@@ -10092,7 +10081,7 @@ msgstr ""
 "\n"
 " !!! НЕ КОРИСТИТЕ ОВО ЗА ВАЖНУ ПОШТУ  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Нисам могао да се повежем на ПОП сервер %s"
@@ -10313,9 +10302,9 @@ msgid "Checking for new messages"
 msgstr "Проверавам за нове поруке"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Смештам директоријум"
@@ -10419,75 +10408,75 @@ msgstr "Не могу да преименујем „%s“: „%s“: %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не могу да преименујем „%s“ у „%s“: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Нисам могао да отворим директоријум: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатална грешка у обради поште на позицији %ld у директоријуму %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не могу да проверим директоријум: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Нисам могао да отворим датотеку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не могу да отворим привремено сандуче: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Нисам могао да затворим изворни директоријум %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Нисам могао да затворим temp директоријум: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Нисам могао да преименујем директоријум: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Неслагање сажетка и директоријума, чак и након синхронизације"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Непозната грешка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Нисам могао да сачувам директоријум: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Грешка код писања у temp сандуче: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Писање у tmp сандуче неуспело: %s: %s"
@@ -10878,7 +10867,7 @@ msgstr "Обриши након %s дана"
 msgid "Disable support for all POP3 extensions"
 msgstr "Онемогући подршку за сва POP3 проширења"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10967,7 +10956,7 @@ msgid "No such folder `%s'."
 msgstr "Нема таквог директоријума `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11020,7 +11009,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Достава поште преко програма sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11186,7 +11175,7 @@ msgstr "SMTP достава поште преко %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Не могу да пошаљем поруку: адреса пошиљаоца није исправна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Слање припремљених порука"
 
@@ -11292,34 +11281,34 @@ msgstr "QUIT захтеву је истекло време: %s"
 msgid "QUIT response error"
 msgstr "QUIT погрешан одговор"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "прилог"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Уклони одабране предмете са листе прилога"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Додај прилог..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Додај датотеку поруци"
 
@@ -11758,16 +11747,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 "%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"
@@ -11819,31 +11804,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -11993,19 +11970,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "За урадити"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Касније"
 
@@ -12110,7 +12087,7 @@ msgid "months"
 msgstr "месеци"
 
 # bug: plural-forms
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "секунде"
 
@@ -12522,7 +12499,7 @@ msgstr "Пошта"
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Особине поште"
 
@@ -12659,122 +12636,123 @@ msgstr "<протисните овде да изаберете директор�
 msgid "Create New Folder"
 msgstr "Направи нови директоријум"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Наведите где да направим директоријум:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Име директоријума:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolder-и"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "НЕПОКЛОПЉЕН"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Сандуче"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Учитавам..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруке у смештај на највишем нивоу"
 
-#: mail/em-folder-tree.c:1760
+#: mail/em-folder-tree.c:1798
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Не могу да преместим директоријум „%s“: неисправна операција"
 
-#: mail/em-folder-tree.c:1789 mail/em-folder-tree.c:1878
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1805 mail/em-folder-tree.c:1818
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
 #: mail/em-folder-view.c:660 mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Направи директоријум"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Не могу да обришем директоријум: %s"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Не могу да обришем локални директоријум „%s“."
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Заиста да бришем директоријум „%s“, и све његове поддиректоријуме?"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Обриши „%s“"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Не могу да преименујем локални директоријум „%s“."
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Преименуј директоријум"
 
-#: mail/em-folder-tree.c:2142
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Директоријум са именом „%s“ већ постоји. Молим користите неко друго име."
 
-#: mail/em-folder-tree.c:2188 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2189
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "Пре_мести"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Нови директоријум..."
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Преимену_ј"
 
-#: mail/em-folder-tree.c:2204 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Особине..."
 
@@ -12906,6 +12884,12 @@ msgstr "Филтрирај према _дописној листи"
 msgid "Filter on Thread"
 msgstr "Филтрирај прем _нити"
 
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Подразумевани"
+
 #: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Штампај поруку"
@@ -13121,7 +13105,7 @@ msgid "Bcc"
 msgstr "Bcc (невидљива копија)"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:739
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Пошиљалац"
 
@@ -13153,15 +13137,20 @@ msgstr "Не могу да обрадим С/МИМЕ поруку: непозн
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподржана врста шифровања за multipart/encrypted"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Непозната грешка при провери потписа"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Непозната грешка при провери потписа"
 
@@ -13181,22 +13170,22 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Неуспешан пренос оставе КИБ-ова за ПОП3: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Неуспешан пренос стања раширености директоријума: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Неуспешно прављење директоријума „%s“: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Неуспешно отварање смештаја за „%s“: %s"
@@ -13322,12 +13311,18 @@ msgstr "Сачувај поруку..."
 msgid "Add address"
 msgstr "Додај адресу"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Пошта од %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Нисам могао да направим привремени директоријум: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13340,7 +13335,7 @@ msgstr ""
 "\n"
 "Заиста уклонити ове поруке?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13364,97 +13359,93 @@ msgstr "Самопрепознавање смешака"
 msgid "Check incoming mail being junk"
 msgstr "Провери да ли је пристигла пошта ђубре"
 
-#: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Провери да ли је пристигла пошта ђубре за ИМАП налоге"
-
 # bug: British or American English?
-#: mail/evolution-mail.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight colour"
 msgstr "Боја истицања цитата"
 
 # bug: British or American English?
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Боја истицања цитата."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Подразумевана висина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Подразумевана ширина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Подразумевани скуп знакова за састављање порука"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Подразумевани скуп знакова за састављање порука."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Подразумевани скуп знакова за приказ порука"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Подразумевани скуп знакова за приказ порука."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Подразумевани стил прослеђивања"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Подразумевана висина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Подразумевана висина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Подразумевани стил одговора"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Подразумевана ширина прозора за састављање"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Подразумевана ширина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Исцртај ознаке грешака при куцању уз речи док куцате."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Испразни директоријуме са смећем на излазу"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Испразни све директоријуме са смећем при затварању Еволуције."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогући приказ курзора, тако да видите курзор док читате поруку."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Укључи/искључи приказ курзора"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Висина површи списка порука"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Висина површи списка порука."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13465,15 +13456,15 @@ msgstr ""
 "користити за приказ садржаја."
 
 # bug: American English or British?
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Списак ознака и одговарајућих боја"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Списак налога"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13481,12 +13472,12 @@ msgstr ""
 "Списак налога које познаје поштански део Еволуције. Списак садржи ниске које "
 "именују подкатегорије у односу на /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr "Списак произвољних заглавља и да ли су укључена."
 
 # bug: American or British English?
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13494,15 +13485,15 @@ msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи ниске које "
 "садрже име:боја где боја користи ХТМЛ хексадекадни запис."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Списак врсти датотека за проналажење Бонобо прегледача"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr "Учитај слике за ХТМЛ поруке преко ХТТП-а"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13512,80 +13503,80 @@ msgstr ""
 "не учитавај поруке преко мреже, 1 — учитај поруке ако је пошиљалац у "
 "адресару, 2 — увек учитај слике преко мреже"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Бележи дејство филтера"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи дејство филтера у наведену датотеку дневника."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Дневник у који да бележи дејство филтера"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Дневник у који да бележи дејство филтера."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Означи као виђену након одређеног времена"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Означи као виђену након одређеног времена."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означи цитате у прегледу поруке"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означи цитате у прегледу поруке."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Подразумевана висина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Подразумевана ширина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Стил приказа поруке (обичан, сва заглавља, изворни)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Звук за обавештење о новој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Врста обавештења о новој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Упитај када је тема празна"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Упитај корисника када жели да испразни директоријум."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Упитај корисника када покуша да пошаље поруку без теме."
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Упитај при пражњењу"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Упитај када корисник упути само невидљиву копију"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13593,100 +13584,92 @@ msgstr ""
 "Упитај када корисник покуша да пошаље ХТМЛ поруке примаоцима који можда не "
 "желе да примају ХТМЛ пошту."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Упитај корисника када покуша да пошаље поруку без навођења коме или копије."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Упитај када корисник покуша да пошаље нежељени ХТМЛ"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Препознај везе у тексту и замени их."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Препознај смешке у тексту и замени их сликама."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Провери да долазећа пошта није ђубре"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Покрени проверу ђубрета за пристиглу пошту на ИМАП налозима (важи једино ако "
-"је постављено check_incoming)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "т4јН4 0пЦиј4"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "т4јН4 0пЦиј4."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Подразумевано шаљи ХТМЛ пошту"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Подразумевано шаљи ХТМЛ пошту."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Прикажи анимације"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Прикажи анимиране слике као анимације."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Прикажи обрисане поруке (прецртане) у списку порука."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Прикажи обрисане поруке у списку порука"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Прикажи површ за преглед"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Прикажи површ за преглед."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Звук који се пушта када стигне нова пошта."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Наводи врсту обавештења о новој пошти које корисник жели да користи."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Истовремена провера правописа"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Фонт за терминал"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Фонт за терминал за приказ поште"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Фонт променљиве ширине за приказ поште"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13698,100 +13681,100 @@ msgstr ""
 "enabled&gt; — постављено на укључено ако заглавље треба приказати при "
 "приказу поште."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Списак порука према нити разговора."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Списак порука према нити разговора"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Списак порука према нити разговора (према теми)"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Време за означавање порука као виђене"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Време за означавање порука као виђене."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "КИБ ниска подразумеваног налога."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Користи услугу и клијента Убице спама"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Користи услугу и клијента Убице спама (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Користи произвољне фонтове"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Користи произвољне фонтове за приказ поште"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Користи само локалне провере спама."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи само локалне провере спама (без ДНС-а)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Фонт променљиве ширине"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Ставка менија Преглед/Невидљива копија је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Ставка менија Преглед/Невидљива копија је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Ставка менија Преглед/Копија је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Ставка менија Преглед/Копија је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Ставка менија Преглед/Од је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Ставка менија Преглед/Од је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Ставка менија Преглед/Пошаљи-коме је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Ставка менија Преглед/Пошаљи-коме је изабрана."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ставка менија Преглед/Одговор-за је изабрана"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ставка менија Преглед/Одговор-за је изабрана."
 
 # Да ли ово треба оставити на енглеском, пошто су дословна имена заглавља?
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13799,11 +13782,11 @@ msgstr ""
 "Да ли се покушава приказ нити расправе помоћу наслова када поруке не садрже "
 "заглавља Као-одговор-на и Референце."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "порт за покретање корисниковог spamd-а"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "порт spamd-а"
 
@@ -13840,15 +13823,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Еволуција увози вашу стару Elm пошту"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Увозим..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Молим сачекајте"
@@ -13869,22 +13852,22 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Одредишни директоријум:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
 msgstr "Изаберите директоријум у који да увезем"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увозим „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Увозим поштанско сандуче"
@@ -14041,15 +14024,15 @@ msgstr "Нисте унели све потребне податке."
 msgid "Evolution Account Editor"
 msgstr "Уредник Еволуција налога"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Домаћин:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Корисничко_име"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Путања:"
 
@@ -14102,27 +14085,42 @@ msgstr ""
 "    '%s'\n"
 "И освежен садржај."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непослате поруке, желите ли свеједно да изађете?"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Нови VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Филтери поште"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Направи нови календар"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "Адреса извора поште који ће бити приказани у прегледу"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Личност"
 
@@ -14164,7 +14162,7 @@ msgstr ""
 "Молим унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, "
 "питајте систем администратора или понуђача Интернет сервиса."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Управљање налозима"
 
@@ -14190,118 +14188,114 @@ msgid "Connecting to server..."
 msgstr "Повезујем се на сервер..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Проверавам подржане типове "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL није подржан у овој верзији Еволуције)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL није подржан у овој верзији еволуције)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Приказана заглавља порука</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Такође шифруј на мене код слања шифроване поште"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Информација о налогу"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Додај ск_рипту"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Додај нови потпис..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Ув_ек шифрирај на мене код слања шифроване поште"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Увек пошаљи _скривену копију (Bcc) на:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Увек пошаљи _копију (Cc) на:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Увек _веруј кључевима у мојој вези када шифрираш"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Приложи оригиналну поруку"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прилог"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Идентификација"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтички (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтички (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "К_одна страна:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Боје"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Провери пристиг_лу пошту"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Провери за нову пошту"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Провери да пристигле поруке нису ђубре"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Боја за _погрешно написане речи:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Подешавања"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14317,278 +14311,274 @@ msgstr ""
 "\n"
 "Притисните \"Примени\" да сачувате подешавања."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Пре_дефинисано"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Предефинисано понашање"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Предефинисана кодна _страна"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Брисање поште"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Дигитално потпиши одлазеће поруке (подразумевано)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "_Не проверавај за новопристиглу пошту на ИМАП налозима"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Не цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанцима (за компатибилност са Outlook-ом)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Д_иректоријум Припрема:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Електронски налози"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Електронска адреса:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Испразни директоријуме са _смећем на излазу"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за ши_фровање:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Помоћник за налоге Еволуције"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Изврши команду..."
 
 # bug: space too much?
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "У_тврђене-ширине:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Опције филтера"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Особине писма"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Среди поруке у H_TML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Заглавља"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Унутар"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Етикете и боје"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Учитавање слика"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Подешавање поште"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Локација сандучета"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Састављач поруке"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Приказ поруке"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Писма поруке"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Обавештење о новој пошти"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Напомена: бићете упитани за лозинку док се не повежете први пут"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Опционе информације"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG лична карта _кључа:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Изаберите боју"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Упозори када шаљеш поруке само са дефинисаним Bcc примаоцима"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Штампана писма"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "За_памти ову лозинку"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Од_говори-на:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Примање поште"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Опције за примање"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Запамти ову _лозинку"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Неопходне информације"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Поврати предефинисано"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "С_игурност"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Сигурни MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Одабери HTML писмо фиксиране величине"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Одабери HTML писмо фиксиране величине за штампу"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Одабери HTML писмо варијабилне величине"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Одабери HTML писмо варијабилне величине за штампу"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Директоријум Послате _поруке"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Поруке из Припреме и Послато директоријума"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи идентификацију"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Подешавање сервера"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Тип сервера"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Сертификат за _потписивање:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Одреди име _датотеке:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Провера _правописа"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Стандардни Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14598,7 +14588,7 @@ msgstr ""
 "потпис. Име које сте дали ће бити коришћено\n"
 "само за сврху приказивања на екрану."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14607,7 +14597,7 @@ msgstr ""
 "Ова вам страна омогућава да подесите проверу правописа и језик. Листа језика "
 "овде осликава само оне језике за које постоји инсталиран речник."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14615,15 +14605,15 @@ msgstr ""
 "Унесите име по коме желите да назовете овај налог.\n"
 "На пример: \"Пословни\" или \"Лични\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Користи _услужни програм"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "В_аријабилна ширина:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14633,171 +14623,171 @@ msgstr ""
 "\n"
 "Притисните \"Напред\" за почетак. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Увек учитај слике са мреже"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Увек потпиши одлазеће поруке на овом налогу"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Тип идентификације: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_тип идентификације: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Аутоматски провери за нову пошту сваких"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Аутоматски убаци слике са осмесима"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Огласи се када стигне нова пошта"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Потврди када избацујеш директоријум"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Предефинисан потпис:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Предефинисано"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Немој да ме обавештаваш када стигне нова пошта"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Шифруј одлазеће поруке (подразумевано)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Пуно име:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML пошта"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Личност"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Ђубре"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Учитај слике ако је пошиљалац у адресару"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Само _локалне пробе"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Нека ово буде мој главни налог"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Име:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Никада не учитавај слике са мреже"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Пусти звучну датотеку када стигне нова пошта"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Упозори када шаљеш HTML поруке онима који их не желе"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Упозори када шаљеш поруке без наслова"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Примање поште"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Поврати предефинисано"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Изабери..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Слање поште"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Покажи анимиране слике"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Потписи"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Стандардно писмо:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Писмо за терминал:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Користи сигурносну везу (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи иста писма као други програми"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингујем %s"
@@ -14832,12 +14822,12 @@ msgstr "Филтрирам директоријум"
 msgid "Fetching Mail"
 msgstr "Узимам пошту"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспешна примена одлазећих филтера: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14846,118 +14836,118 @@ msgstr ""
 "Неуспешно додавање у %s: %s\n"
 "Додајем у локални директоријум Послато."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспешно додавање у локални директоријум Послато: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Шаљем \"%s\""
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Неуспех код поруке %d од %d"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Готово."
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Чувам поруку у директоријум"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премештам поруке у %s"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирам поруке у %s"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претражујем директоријуме у \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отварам директоријум %s"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Отварам оставу %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Уклањам директоријум %s"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам директоријум '%s'"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Чистим и смештам налог „%s“"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Освежавам директоријум"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Избацујем директоријум"
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празним смеће у '%s'"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Локални директоријуми"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Учитавам поруку %s"
 
 # bug: plural-forms
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Учитавам %d порука(е)"
 
 # bug: plural-forms
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Чувам %d порука(е)"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14966,7 +14956,7 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14975,11 +14965,11 @@ msgstr ""
 "Грешка код чувања порука у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Чувам прилог"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14988,22 +14978,22 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидам везу са %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поново се повезујем на %s"
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Измена стања ђубрета"
 
@@ -15035,38 +15025,38 @@ msgstr "Шифровање"
 msgid "Security Information"
 msgstr "Безбедносни подаци"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Поништавам..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, врста: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Путања: %s, врста: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Врста: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Пошаљи и прими пошту"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Поништи _све"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Освежавам..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Чекам..."
 
@@ -18280,6 +18270,22 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Провери да ли је пристигла пошта ђубре за ИМАП налоге"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Покрени проверу ђубрета за пристиглу пошту на ИМАП налозима (важи једино "
+#~ "ако је постављено check_incoming)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "_Не проверавај за новопристиглу пошту на ИМАП налозима"
+
 #~ msgid "No data provided"
 #~ msgstr "Нисам добио податке"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index dca6637397..5785517c54 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-01 17:54+0100\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-03-01 18:28+0100\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.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"
 
@@ -49,7 +49,6 @@ msgstr "Podesite ovde samodopunjavanje"
 #. 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:363
@@ -93,19 +92,19 @@ msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
 msgid "Manager your S/Mime certificates here"
 msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:225
 #, 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-component.c:269
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-component.c:270
+#: addressbook/gui/component/addressbook-component.c:309
 #: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:362 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -113,60 +112,60 @@ msgstr "Novi adresar"
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: calendar/gui/calendar-component.c:363 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Osobine..."
 
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "_Spisak kontakata"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Napravi novi spisak kontakata"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Neuspešna prijava na LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Nisam mogao da obavim upit na Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Server je odgovorio nepodržanim bazama za pretragu"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Greška u čitanju podataka šeme"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Server nije odgovorio sa ispravnim podacima šeme"
 
@@ -194,20 +193,18 @@ msgid "Migrating `%s':"
 msgstr "Prenosim „%s“:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159 mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Na ovom računaru"
 
 #. Create the default Person addressbook
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Lično"
 
@@ -363,7 +360,7 @@ msgstr " P_okaži podržane baze "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -407,7 +404,7 @@ msgid "Address Book Sources"
 msgstr "Izvori adresara"
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Uvek"
 
@@ -467,7 +464,7 @@ msgid "Group:"
 msgstr "Grupa:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Nikada"
 
@@ -549,7 +546,8 @@ msgid ""
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
-"Odabiranje ove opcije omogućiće promenu podrazumevanih podešavanja  Evolucije\n"
+"Odabiranje ove opcije omogućiće promenu podrazumevanih podešavanja  "
+"Evolucije\n"
 "za LDAP pretrage, i za upisivanje i menjanje kontakata. "
 
 # bug: formatting?
@@ -711,7 +709,7 @@ msgid "Using email address"
 msgstr "Koristim elektronsku adresu"
 
 #: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
@@ -739,7 +737,7 @@ msgstr "Limit za _preuzimanje:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -989,9 +987,9 @@ msgstr "Ka_tegorije..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
 #: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2200
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
 #: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
@@ -2083,7 +2081,7 @@ msgstr "Kuća"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
 #: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Posao"
 
@@ -2446,13 +2444,13 @@ msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
@@ -2542,7 +2540,7 @@ msgstr "Iseci"
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:360
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/dialogs/copy-source-dialog.c:159
 #: 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
@@ -2573,7 +2571,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1607
-#: calendar/gui/cal-search-bar.c:353
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
@@ -3106,17 +3104,17 @@ msgstr "Pogled karte"
 msgid "GTK Tree View"
 msgstr "Pogled GTK stabla"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Proba preispunjavanja"
 
-#: 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 "Sva prava zadržana ©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 "Ovo isprobava preispunjavanje polja"
 
@@ -3242,7 +3240,7 @@ msgstr "Margine"
 msgid "Number of columns:"
 msgstr "Broj kolona:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcije"
 
@@ -3422,7 +3420,7 @@ msgstr "Ime datoteke nije dato."
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1156
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
 #: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "Unesite lozinku"
@@ -3500,7 +3498,7 @@ 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:1101 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
@@ -3758,23 +3756,30 @@ msgstr "Da li da prikazujem vreme u 24č obliku umesto am/pm"
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Neraspodeljeno"
 
 #: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3804,10 +3809,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:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -3831,70 +3832,70 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "Zakazani _sastanak"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Zakaži sastanak"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:611
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Sačini novi zahtev za sastanak"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "Novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Celo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Sačini novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:625
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "K_alendar"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, 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:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
@@ -4028,7 +4029,7 @@ msgstr "sati"
 msgid "minutes"
 msgstr "minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr "Dejstvo/pokreni"
 
@@ -4101,7 +4102,7 @@ msgstr "sat(a)"
 
 # bug:plural-forms
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minut(a)"
 
@@ -4163,7 +4164,7 @@ msgstr "30 minuta"
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Upozorenja"
 
@@ -4188,7 +4189,7 @@ msgid "Days"
 msgstr "Dani"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "O_mogući"
 
@@ -4328,7 +4329,7 @@ msgid "_Fri"
 msgstr "_Pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Opšte"
 
@@ -4533,8 +4534,8 @@ msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
-"Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za njegovo "
-"otkazivanje?"
+"Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za "
+"njegovo otkazivanje?"
 
 #: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4812,23 +4813,32 @@ msgstr "Zakazivanje"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "Datum završetka je pre datuma početka!"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Krajnji datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Početno vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Krajnje vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ne mogu da otvorim kalendar „%s“."
@@ -4902,36 +4912,31 @@ msgid "_Start time:"
 msgstr "_Početno vreme:"
 
 #. 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:591 composer/e-msg-composer.c:2084
 #: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ništa"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Zahteva organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan prisutni je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
@@ -5119,7 +5124,7 @@ msgstr "na"
 msgid "occurrences"
 msgstr "pojave"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -5152,7 +5157,7 @@ msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -5218,7 +5223,7 @@ msgstr "Informacija o primljenom zaduženju je sačinjena. Da je pošaljem?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacija o zaduženju je izmenjena. Da pošaljem noviju verziju?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
@@ -5302,16 +5307,16 @@ msgstr "Osnovno"
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "Datum završetka je pre datuma početka!"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ne mogu da otvorim zaduženja u „%s“."
@@ -5322,7 +5327,7 @@ msgstr "Pov_erljivo"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5519,7 +5524,7 @@ msgstr "Početni datum"
 msgid "Summary"
 msgstr "Izveštaj"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "boja"
 
@@ -5582,7 +5587,7 @@ msgstr "Ne"
 #: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2097
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Nepoznato"
@@ -5671,7 +5676,7 @@ msgstr "_Iseci"
 
 #: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
@@ -5780,7 +5785,7 @@ msgid "Alarms"
 msgstr "Alarmi"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:580
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Završeno"
 
@@ -5809,20 +5814,12 @@ msgid "URL"
 msgstr "URL"
 
 #. 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"
@@ -5846,10 +5843,6 @@ msgstr "%02i minutni razmaci"
 
 #. 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:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5857,9 +5850,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-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -6061,7 +6051,7 @@ msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
@@ -6423,10 +6413,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-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
@@ -6435,10 +6421,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:1606
 msgid "%m/%d/%Y"
@@ -6527,7 +6509,7 @@ msgstr "Veb stranica:"
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6537,7 +6519,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6548,12 +6530,12 @@ msgstr ""
 "%s\n"
 " je pukla."
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6562,19 +6544,19 @@ msgstr ""
 "Greška pri otvaranju %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "Učitavam zaduženja"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Izbacujem"
 
@@ -6714,11 +6696,11 @@ msgstr "Slobodan/zauzet informacija (%s do %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informacija"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za „%s“"
@@ -8788,7 +8770,7 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 
-#: camel/camel-filter-search.c:669 camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primene filtera za pretragu: %s: %s"
@@ -8877,7 +8859,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Poništeno."
 
@@ -9146,8 +9128,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Ova opcija će povezati na server korišćenjem sigurnosne CRAM-MD5 lozinke, ako "
-"je server podržava."
+"Ova opcija će povezati na server korišćenjem sigurnosne CRAM-MD5 lozinke, "
+"ako je server podržava."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -9254,7 +9236,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor na prijavu od servera."
 
@@ -9467,11 +9449,11 @@ msgstr "Ne mogu da napravim direktorijum: neispravna operacija"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1128
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1132
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Đubre"
@@ -9741,7 +9723,7 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Primeni filtere na nove poruke u Inbox-u ovog servera"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatski uskladi udaljenu poštu sa lokalnom"
 
@@ -9762,37 +9744,35 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristup Novel Grupvajz serverima"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Lozinka"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Podrazumevani"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "lista"
 
 #: 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:2869
+#: camel/providers/imap/camel-imap-store.c:2888
 msgid "Operation cancelled"
 msgstr "Operacija obustavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neočekivano isključena: %s"
@@ -9841,21 +9821,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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 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:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Tragam za promenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9871,25 +9851,25 @@ msgstr ""
 "Ne mogu da dobijem poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Ova poruke nije trenutno dostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao da pronađem tekst poruke u FETCH odgovoru."
 
@@ -9944,27 +9924,37 @@ msgstr "Format imena"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primeni filtere na nove poruke u INBOX-u ovog servera"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Proveri za nove poruke u svim direktorijumima"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Proveri za nove poruke u svim direktorijumima"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9973,64 +9963,64 @@ msgstr "IMAP servis za %s na %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Niste uneli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10041,13 +10031,13 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takvog direktorijuma %s"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1786
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:234
@@ -10055,18 +10045,18 @@ msgstr "Nema takvog direktorijuma %s"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznati glavni direktorijum: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorijum ne može sadržati direktorijume u sebi"
 
@@ -10092,7 +10082,7 @@ msgstr ""
 "\n"
 " !!! NE KORISTITE OVO ZA VAŽNU POŠTU  !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nisam mogao da se povežem na POP server %s"
@@ -10170,7 +10160,8 @@ 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 ""
-"Za čitanje i smeštanje lokalne pošte u spoljne standardne mbox spool datoteke.\n"
+"Za čitanje i smeštanje lokalne pošte u spoljne standardne mbox spool "
+"datoteke.\n"
 "Takođe se može koristiti za čitanje stabla direktorijuma u Elm, Pine, ili "
 "Mutt stilu."
 
@@ -10313,9 +10304,9 @@ msgid "Checking for new messages"
 msgstr "Proveravam za nove poruke"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Smeštam direktorijum"
@@ -10419,75 +10410,75 @@ msgstr "Ne mogu da preimenujem „%s“: „%s“: %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisam mogao da otvorim direktorijum: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatalna greška u obradi pošte na poziciji %ld u direktorijumu %s"
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu da proverim direktorijum: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisam mogao da otvorim datoteku: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne mogu da otvorim privremeno sanduče: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisam mogao da zatvorim izvorni direktorijum %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisam mogao da zatvorim temp direktorijum: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:571 mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisam mogao da preimenujem direktorijum: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Neslaganje sažetka i direktorijuma, čak i nakon sinhronizacije"
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greška: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisam mogao da sačuvam direktorijum: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Greška kod pisanja u temp sanduče: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje u tmp sanduče neuspelo: %s: %s"
@@ -10878,7 +10869,7 @@ msgstr "Obriši nakon %s dana"
 msgid "Disable support for all POP3 extensions"
 msgstr "Onemogući podršku za sva POP3 proširenja"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10967,7 +10958,7 @@ msgid "No such folder `%s'."
 msgstr "Nema takvog direktorijuma `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11020,7 +11011,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11186,7 +11177,7 @@ msgstr "SMTP dostava pošte preko %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu da pošaljem poruku: adresa pošiljaoca nije ispravna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Slanje pripremljenih poruka"
 
@@ -11268,7 +11259,8 @@ msgstr "DATA pogrešan odgovor"
 #: camel/providers/smtp/camel-smtp-transport.c:1341
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA slanju isteklo je vreme: završetak poruke: %s: poruka nije poslata"
+msgstr ""
+"DATA slanju isteklo je vreme: završetak poruke: %s: poruka nije poslata"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1361
 msgid "DATA termination response error"
@@ -11292,34 +11284,34 @@ msgstr "QUIT zahtevu je isteklo vreme: %s"
 msgid "QUIT response error"
 msgstr "QUIT pogrešan odgovor"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Dodaj datoteku poruci"
 
@@ -11448,8 +11440,8 @@ 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"
+"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
+"šifrovanje na ovom nalogu"
 
 #: composer/e-msg-composer.c:789
 #, c-format
@@ -11608,7 +11600,8 @@ 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>"
+"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
+"<b>"
 
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
@@ -11758,16 +11751,12 @@ msgstr "Sinhronizujem kategorije:"
 
 #. 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"
@@ -11819,31 +11808,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:1416 widgets/misc/e-dateedit.c:1641
 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:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
@@ -11993,19 +11974,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Kasnije"
 
@@ -12110,7 +12091,7 @@ msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekunde"
 
@@ -12522,7 +12503,7 @@ msgstr "Pošta"
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Osobine pošte"
 
@@ -12596,8 +12577,8 @@ msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Pošto je kontakt lista koju šaljete podešena da sakrije adrese, ova poruke će "
-"sadržati samo skrivene primaoce."
+"Pošto je kontakt lista koju šaljete podešena da sakrije adrese, ova poruke "
+"će sadržati samo skrivene primaoce."
 
 #: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
@@ -12659,122 +12640,123 @@ msgstr "<protisnite ovde da izaberete direktorijum>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorijum"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
 #: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolder-i"
 
-#: mail/em-folder-tree-model.c:173 mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr "NEPOKLOPLjEN"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201 mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: mail/em-folder-tree-model.c:446 mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:831
 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:1760
+#: mail/em-folder-tree.c:1798
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "Ne mogu da premestim direktorijum „%s“: neispravna operacija"
 
-#: mail/em-folder-tree.c:1789 mail/em-folder-tree.c:1878
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1805 mail/em-folder-tree.c:1818
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
 #: mail/em-folder-view.c:660 mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "Ne mogu da obrišem direktorijum: %s"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2094
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "Ne mogu da obrišem lokalni direktorijum „%s“."
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Zaista da brišem direktorijum „%s“, i sve njegove poddirektorijume?"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Obriši „%s“"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "Ne mogu da preimenujem lokalni direktorijum „%s“."
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2142
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 "Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
 
-#: mail/em-folder-tree.c:2188 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2189
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "Pre_mesti"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Preimenu_j"
 
-#: mail/em-folder-tree.c:2204 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Osobine..."
 
@@ -12906,6 +12888,12 @@ msgstr "Filtriraj prema _dopisnoj listi"
 msgid "Filter on Thread"
 msgstr "Filtriraj prem _niti"
 
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Podrazumevani"
+
 #: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Štampaj poruku"
@@ -12970,8 +12958,8 @@ msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"Poruka je potpisana ispravnim potpisom, ali pošiljalac poruke nije mogao biti "
-"proveren."
+"Poruka je potpisana ispravnim potpisom, ali pošiljalac poruke nije mogao "
+"biti proveren."
 
 #: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
@@ -13121,7 +13109,7 @@ msgid "Bcc"
 msgstr "Bcc (nevidljiva kopija)"
 
 #: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:739
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Pošiljalac"
 
@@ -13153,15 +13141,20 @@ msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1316
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nepoznata greška pri proveri potpisa"
+
+#: mail/em-format.c:1324
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greška pri proveri potpisa"
 
@@ -13176,27 +13169,27 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Putanja i hijerarhija direktorijuma pošte u Evoluciji je izmenjen od izdanja 1."
-"*.\n"
+"Putanja i hijerarhija direktorijuma pošte u Evoluciji je izmenjen od izdanja "
+"1.*.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Neuspešan prenos ostave KIB-ova za POP3: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Neuspešan prenos stanja raširenosti direktorijuma: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Neuspešno pravljenje direktorijuma „%s“: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Neuspešno otvaranje smeštaja za „%s“: %s"
@@ -13322,12 +13315,18 @@ msgstr "Sačuvaj poruku..."
 msgid "Add address"
 msgstr "Dodaj adresu"
 
-#: mail/em-utils.c:2088
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Pošta od %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2434
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13340,7 +13339,7 @@ msgstr ""
 "\n"
 "Zaista ukloniti ove poruke?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2459
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
 "If you continue, you will not be able to recover these messages.\n"
@@ -13364,97 +13363,93 @@ msgstr "Samoprepoznavanje smešaka"
 msgid "Check incoming mail being junk"
 msgstr "Proveri da li je pristigla pošta đubre"
 
-#: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr "Proveri da li je pristigla pošta đubre za IMAP naloge"
-
 # bug: British or American English?
-#: mail/evolution-mail.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight colour"
 msgstr "Boja isticanja citata"
 
 # bug: British or American English?
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
 msgstr "Boja isticanja citata."
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Podrazumevana visina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Podrazumevana širina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Podrazumevani skup znakova za sastavljanje poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Podrazumevani skup znakova za sastavljanje poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Podrazumevana visina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default width of the Composer Window"
 msgstr "Podrazumevana širina prozora za sastavljanje"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Message Window"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtaj oznake grešaka pri kucanju uz reči dok kucate."
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Empty Trash folders on exit"
 msgstr "Isprazni direktorijume sa smećem na izlazu"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Isprazni sve direktorijume sa smećem pri zatvaranju Evolucije."
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogući prikaz kurzora, tako da vidite kurzor dok čitate poruku."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr "Uključi/isključi prikaz kurzora"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr "Visina površi spiska poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr "Visina površi spiska poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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 "
@@ -13465,15 +13460,15 @@ msgstr ""
 "koristiti za prikaz sadržaja."
 
 # bug: American English or British?
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr "Spisak oznaka i odgovarajućih boja"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of accounts"
 msgstr "Spisak naloga"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13481,12 +13476,12 @@ 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:30
+#: mail/evolution-mail.schemas.in.in.h:29
 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:31
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
@@ -13494,15 +13489,15 @@ 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:32
+#: mail/evolution-mail.schemas.in.in.h:31
 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:33
+#: mail/evolution-mail.schemas.in.in.h:32
 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:34
+#: mail/evolution-mail.schemas.in.in.h:33
 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 - "
@@ -13512,80 +13507,80 @@ 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:35
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Log filter actions"
 msgstr "Beleži dejstvo filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:35
 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:37
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik u koji da beleži dejstvo filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik u koji da beleži dejstvo filtera."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao viđenu nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao viđenu nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označi citate u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označi citate u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (običan, sva zaglavlja, izvorni)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr "Zvuk za obaveštenje o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr "Vrsta obaveštenja o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr "Upitaj kada je tema prazna"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:48
 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:50
+#: mail/evolution-mail.schemas.in.in.h:49
 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:51
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr "Upitaj pri pražnjenju"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik uputi samo nevidljivu kopiju"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13593,100 +13588,92 @@ 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:54
+#: mail/evolution-mail.schemas.in.in.h:53
 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:55
+#: mail/evolution-mail.schemas.in.in.h:54
 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:56
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zameni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:56
 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:58
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr "Proveri da dolazeća pošta nije đubre"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-"Pokreni proveru đubreta za pristiglu poštu na IMAP nalozima (važi jedino ako "
-"je postavljeno check_incoming)"
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr "t4jN4 0pCij4"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr "t4jN4 0pCij4."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji HTML poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano šalji HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Show Animations"
 msgstr "Prikaži animacije"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Show animated images as animations."
 msgstr "Prikaži animirane slike kao animacije."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikaži obrisane poruke (precrtane) u spisku poruka."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Show deleted messages in the message-list"
 msgstr "Prikaži obrisane poruke u spisku poruka"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "Prikaži površ za pregled"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "Prikaži površ za pregled."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Sound file to play when new mail arrives."
 msgstr "Zvuk koji se pušta kada stigne nova pošta."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Navodi vrstu obaveštenja o novoj pošti koje korisnik želi da koristi."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Spell check inline"
 msgstr "Istovremena provera pravopisa"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "Font za terminal"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr "Font za terminal za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "The variable width font for mail display"
 msgstr "Font promenljive širine za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13698,100 +13685,100 @@ msgstr ""
 "enabled&gt; — postavljeno na uključeno ako zaglavlje treba prikazati pri "
 "prikazu pošte."
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Thread the message list."
 msgstr "Spisak poruka prema niti razgovora."
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Thread the message-list"
 msgstr "Spisak poruka prema niti razgovora"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr "Spisak poruka prema niti razgovora (prema temi)"
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr "Vreme za označavanje poruka kao viđene"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr "Vreme za označavanje poruka kao viđene."
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "UID string of the default account."
 msgstr "KIB niska podrazumevanog naloga."
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr "Koristi uslugu i klijenta Ubice spama"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Koristi uslugu i klijenta Ubice spama (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr "Koristi proizvoljne fontove"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr "Koristi proizvoljne fontove za prikaz pošte"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Variable width font"
 msgstr "Font promenljive širine"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr "Stavka menija Pregled/Nevidljiva kopija je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr "Stavka menija Pregled/Nevidljiva kopija je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr "Stavka menija Pregled/Kopija je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr "Stavka menija Pregled/Kopija je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr "Stavka menija Pregled/Od je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr "Stavka menija Pregled/Od je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr "Stavka menija Pregled/Pošalji-kome je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr "Stavka menija Pregled/Pošalji-kome je izabrana."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr "Stavka menija Pregled/Odgovor-za je izabrana"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr "Stavka menija Pregled/Odgovor-za je izabrana."
 
 # Da li ovo treba ostaviti na engleskom, pošto su doslovna imena zaglavlja?
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13799,11 +13786,11 @@ msgstr ""
 "Da li se pokušava prikaz niti rasprave pomoću naslova kada poruke ne sadrže "
 "zaglavlja Kao-odgovor-na i Reference."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr "port za pokretanje korisnikovog spamd-a"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "spamd port"
 msgstr "port spamd-a"
 
@@ -13840,15 +13827,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvozi vašu staru Elm poštu"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Uvozim..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim sačekajte"
@@ -13869,22 +13856,22 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 msgid "Destination folder:"
 msgstr "Odredišni direktorijum:"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder to import into"
 msgstr "Izaberite direktorijum u koji da uvezem"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvozim „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 msgid "Importing mailbox"
 msgstr "Uvozim poštansko sanduče"
@@ -14041,15 +14028,15 @@ msgstr "Niste uneli sve potrebne podatke."
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolucija naloga"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Domaćin:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Korisničko_ime"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Putanja:"
 
@@ -14102,27 +14089,42 @@ msgstr ""
 "    '%s'\n"
 "I osvežen sadržaj."
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Novi VFolder"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Filteri pošte"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Napravi novi kalendar"
+
+#: mail/mail-component.c:722
 msgid "URI of the mail source that the view will display"
 msgstr "Adresa izvora pošte koji će biti prikazani u pregledu"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Ličnost"
 
@@ -14164,7 +14166,7 @@ msgstr ""
 "Molim unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
 "pitajte sistem administratora ili ponuđača Internet servisa."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
@@ -14176,8 +14178,8 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"Skoro ste završili sa procesom podešavanja pošte. Ličnost, dolazeći server za "
-"poštu i odlazeći metod prenosa pošte koje ste uneli biće grupisani kao "
+"Skoro ste završili sa procesom podešavanja pošte. Ličnost, dolazeći server "
+"za poštu i odlazeći metod prenosa pošte koje ste uneli biće grupisani kao "
 "Evolucija nalog za poštu. Molim unesite dole ime za ovaj nalog. Ovo ime će "
 "biti korišćeno samo za potrebe prikazivanja na ekranu."
 
@@ -14190,118 +14192,114 @@ msgid "Connecting to server..."
 msgstr "Povezujem se na server..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Proveravam podržane tipove "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL nije podržan u ovoj verziji Evolucije)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL nije podržan u ovoj verziji evolucije)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>_Prikazana zaglavlja poruka</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Takođe šifruj na mene kod slanja šifrovane pošte"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Informacija o nalogu"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Dodaj sk_riptu"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Dodaj novi potpis..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Uv_ek šifriraj na mene kod slanja šifrovane pošte"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Uvek pošalji _skrivenu kopiju (Bcc) na:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Uvek pošalji _kopiju (Cc) na:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvek _veruj ključevima u mojoj vezi kada šifriraš"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Priloži originalnu poruku"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Prilog"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Identifikacija"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "K_odna strana:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Boje"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "Check _Incoming Mail"
 msgstr "Proveri pristig_lu poštu"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Proveri za novu poštu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Proveri da pristigle poruke nisu đubre"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Podešavanja"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14317,278 +14315,274 @@ msgstr ""
 "\n"
 "Pritisnite \"Primeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Pre_definisano"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Predefinisano ponašanje"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Predefinisana kodna _strana"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Brisanje pošte"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Digitalno potpiši odlazeće poruke (podrazumevano)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "_Ne proveravaj za novopristiglu poštu na IMAP nalozima"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "D_irektorijum Priprema:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Elektronski nalozi"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Elektronska adresa:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Isprazni direktorijume sa _smećem na izlazu"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za ši_frovanje:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik za naloge Evolucije"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Izvrši komandu..."
 
 # bug: space too much?
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "U_tvrđene-širine:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "Opcije filtera"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Sredi poruke u H_TML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Zaglavlja"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Unutar"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etikete i boje"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Učitavanje slika"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Lokacija sandučeta"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Pisma poruke"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Obaveštenje o novoj pošti"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: bićete upitani za lozinku dok se ne povežete prvi put"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Opcione informacije"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG lična karta _ključa:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada šalješ poruke samo sa definisanim Bcc primaocima"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Štampana pisma"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Za_pamti ovu lozinku"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Od_govori-na:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Opcije za primanje"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Zapamti ovu _lozinku"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Neophodne informacije"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Povrati predefinisano"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_igurnost"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Sigurni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Odaberi HTML pismo fiksirane veličine"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberi HTML pismo fiksirane veličine za štampu"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Odaberi HTML pismo varijabilne veličine"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberi HTML pismo varijabilne veličine za štampu"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Direktorijum Poslate _poruke"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Poruke iz Pripreme i Poslato direktorijuma"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži identifikaciju"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Podešavanje servera"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tip servera"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Provera _pravopisa"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standardni Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14598,7 +14592,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14607,7 +14601,7 @@ msgstr ""
 "Ova vam strana omogućava da podesite proveru pravopisa i jezik. Lista jezika "
 "ovde oslikava samo one jezike za koje postoji instaliran rečnik."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14615,15 +14609,15 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: \"Poslovni\" ili \"Lični\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr "Koristi _uslužni program"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14633,171 +14627,171 @@ msgstr ""
 "\n"
 "Pritisnite \"Napred\" za početak. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Uvek učitaj slike sa mreže"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Uvek potpiši odlazeće poruke na ovom nalogu"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Tip identifikacije: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_tip identifikacije: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Automatski proveri za novu poštu svakih"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatski ubaci slike sa osmesima"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Oglasi se kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Potvrdi kada izbacuješ direktorijum"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Predefinisan potpis:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Predefinisano"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Šifruj odlazeće poruke (podrazumevano)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Puno ime:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML pošta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Ličnost"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Učitaj slike ako je pošiljalac u adresaru"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "Samo _lokalne probe"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj glavni nalog"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Nikada ne učitavaj slike sa mreže"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Primanje pošte"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Povrati predefinisano"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Izaberi..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Slanje pošte"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Potpisi"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standardno pismo:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Pismo za terminal:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Koristi sigurnosnu vezu (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingujem %s"
@@ -14832,12 +14826,12 @@ msgstr "Filtriram direktorijum"
 msgid "Fetching Mail"
 msgstr "Uzimam poštu"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspešna primena odlazećih filtera: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14846,118 +14840,118 @@ msgstr ""
 "Neuspešno dodavanje u %s: %s\n"
 "Dodajem u lokalni direktorijum Poslato."
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neuspešno dodavanje u lokalni direktorijum Poslato: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Šaljem \"%s\""
 
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh kod poruke %d od %d"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Čuvam poruku u direktorijum"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštam poruke u %s"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorijume u \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram direktorijum %s"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram ostavu %s"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam direktorijum %s"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorijum '%s'"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1584
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Osvežavam direktorijum"
 
-#: mail/mail-ops.c:1683 mail/mail-ops.c:1734
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Izbacujem direktorijum"
 
-#: mail/mail-ops.c:1731
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokalni direktorijumi"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
 # bug: plural-forms
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Učitavam %d poruka(e)"
 
 # bug: plural-forms
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Čuvam %d poruka(e)"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14966,7 +14960,7 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14975,11 +14969,11 @@ msgstr ""
 "Greška kod čuvanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14988,22 +14982,22 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-ops.c:2415
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr "Izmena stanja đubreta"
 
@@ -15035,38 +15029,38 @@ msgstr "Šifrovanje"
 msgid "Security Information"
 msgstr "Bezbednosni podaci"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Poništavam..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, vrsta: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Putanja: %s, vrsta: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Pošalji i primi poštu"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Poništi _sve"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Osvežavam..."
 
-#: mail/mail-send-recv.c:392 mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Čekam..."
 
@@ -15419,8 +15413,8 @@ msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
-"Ako je postavljeno, prozorče sa upozorenjem u razvojnim izdanjima Evolucije se "
-"neće prikazivati."
+"Ako je postavljeno, prozorče sa upozorenjem u razvojnim izdanjima Evolucije "
+"se neće prikazivati."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid ""
@@ -15705,9 +15699,9 @@ msgid ""
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
-"Ukoliko sada zatvorite Evolucijinog pomoćnika za podešavanje, svi podaci koje "
-"ste uneli će biti zanemareni. Moraćete da pokrenete ovog pomoćnika ponovo "
-"pre upotrebe Evolucije.\n"
+"Ukoliko sada zatvorite Evolucijinog pomoćnika za podešavanje, svi podaci "
+"koje ste uneli će biti zanemareni. Moraćete da pokrenete ovog pomoćnika "
+"ponovo pre upotrebe Evolucije.\n"
 "\n"
 "Želite li da sada zatvorite pomoćnika?"
 
@@ -15795,7 +15789,8 @@ msgid ""
 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"
+"Vaši podaci nisu obrisani, ali neće biti prikazani u ovom izdanju "
+"Evolucije.\n"
 
 #: shell/e-shell.c:1063
 msgid "Invalid arguments"
@@ -18182,8 +18177,8 @@ msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
-"Ako je postavljeno, podvlaka u tekstu označava tekst koji će se koristiti kao "
-"prečica"
+"Ako je postavljeno, podvlaka u tekstu označava tekst koji će se koristiti "
+"kao prečica"
 
 #: widgets/misc/e-expander.c:205
 msgid "Spacing"
@@ -18280,6 +18275,22 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#~ msgid "Check incoming mail being junk for IMAP accounts"
+#~ msgstr "Proveri da li je pristigla pošta đubre za IMAP naloge"
+
+#~ msgid ""
+#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
+#~ "check_incoming is set to true)"
+#~ msgstr ""
+#~ "Pokreni proveru đubreta za pristiglu poštu na IMAP nalozima (važi jedino "
+#~ "ako je postavljeno check_incoming)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "_Ne proveravaj za novopristiglu poštu na IMAP nalozima"
+
 #~ msgid "No data provided"
 #~ msgstr "Nisam dobio podatke"
 
diff --git a/po/sv.po b/po/sv.po
index 2727b99a54..4827571e9b 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.190 2004/02/09 20:45:33 jpr Exp $
+# $Id: sv.po,v 1.191 2004/03/05 19:47:42 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2003-06-20 23:28+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -55,8 +55,7 @@ msgstr "Konfigurera dina e-postkonton här"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -97,20 +96,20 @@ msgstr "Evolutions konfigurationskontroll för mappinställningar"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Adressbok"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -118,67 +117,67 @@ msgstr "Adressbok"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Ny kontakt:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Misslyckades med att ansluta till LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Misslyckades med att autentisera till LDAP-server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Kunde inte utföra fråga på rot-DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Servern svarade med inga sökbaser stöds"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denna server stöder inte LDAPv3-schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Fel vid hämtande av filterinformation"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Servern svarade inte med giltig schemainformation"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Väntar..."
@@ -192,42 +191,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Skapar \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personligt"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Mappar för automatisk ifyllning"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -239,7 +240,7 @@ msgstr ""
 "Gör din sökning mer specifik eller höj resultatgränsen i\n"
 "katalogserverinställningarna för denna adressbok."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -251,19 +252,19 @@ msgstr ""
 "specifik eller höj resultatgränsen i katalogserverinställningarna\n"
 "för denna adressbok."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Denna fråga returnerade inte utan problem."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -272,7 +273,7 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt den."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -282,7 +283,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -294,7 +295,7 @@ msgstr ""
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -304,28 +305,33 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAnge lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI:n som kalendern kommer att visa"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI:n som kalendern kommer att visa"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -369,7 +375,7 @@ msgstr "  _Visa de baser som stöds "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -402,20 +408,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Adressboksinställningar"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Adressbokskällor"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adressbokskällor"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adressbokskällor..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alltid"
 
@@ -426,7 +433,8 @@ msgstr "Anonymt"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -436,54 +444,54 @@ msgstr ""
 "Klicka på knappen \"Slutför\" för att spara de inställningar du har angivit "
 "här."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Klar"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmänt"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -497,23 +505,23 @@ msgstr ""
 "servrar för att kryptografiskt skydda din anslutning. Fråga din "
 "systemadministratör om din LDAP-server använder dessa protokoll."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "S_ökomfattning: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Söker"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Markerat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -523,7 +531,7 @@ msgstr ""
 "till din\n"
 "LDAP-server om den stöder SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -540,7 +548,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:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -554,7 +562,7 @@ msgstr ""
 "att vara\n"
 "sårbar för säkerhetsluckor."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -565,44 +573,45 @@ msgstr ""
 "inställningar\n"
 "för LDAP-sökningar, och för skapande och redigering av kontakter."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Att välja ett visningsnamn är det sista nödvändiga steget vid konfiguration "
 "av en LDAP-server."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Steg 1: Serverinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Steg 2: Ansluter till server"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Steg 3: Söker i katalogen"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Pren"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -616,7 +625,7 @@ msgstr ""
 "måste ändra\n"
 "dessa alternativ."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -628,7 +637,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -644,12 +653,13 @@ 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:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -661,7 +671,7 @@ msgstr ""
 "servern. Kontakta din systemadministratör om behöver hjälp med att hitta "
 "denna information."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -669,17 +679,18 @@ msgstr ""
 "Detta är det fullständiga namnet på din ldap-server. Till exempel \"ldap."
 "mittforetag.se\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Detta är det största antalet poster att hämta. Att ställa in detta tal för "
 "högt\n"
 "kommer att slöa ned adressboken."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -689,7 +700,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -699,7 +710,7 @@ msgstr ""
 "mapplista.\n"
 "Det används endast för visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -710,7 +721,7 @@ msgstr ""
 "mapplista.\n"
 "Det används endast för visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -722,28 +733,28 @@ msgstr ""
 "En lista med standardportar tillhandahålls. Fråga din systemadministratör "
 "vilken port du ska ange."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "An_vänd SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Använder distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Använder e-postadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Närsomhelst"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -756,19 +767,19 @@ msgstr ""
 "inloggningsinformation. Fråga din systemadministratör om du är osäker "
 "angående denna information."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Visa namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -777,39 +788,39 @@ msgstr "_Hämtningsgräns:"
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Inloggningsmetod:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Servernamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "anslutningsflik"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "allmän-flik"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "sökflik"
 
@@ -932,7 +943,7 @@ msgstr "Samarbete"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1029,10 +1040,10 @@ msgstr "_Kategorier..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1080,15 +1091,15 @@ msgid "_Web page address:"
 msgstr "_Webbsideadress:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Adress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2080,109 +2091,117 @@ msgid "AOL Instant Messenger"
 msgstr "_Posta meddelande"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Namnlös lista"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_E-postmeddelande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Lägg till tjänst"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Plats:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Användar_namn:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Hem"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Jobb"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Annat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Källkod"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Ändrad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Kontonamn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategoriredigeraren är inte tillgänglig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Spara kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2190,7 +2209,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort dessa kontakter?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2198,47 +2217,52 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort denna kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Företag"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupp"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Fullständigt namn:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "E-_post:"
 
@@ -2397,11 +2421,11 @@ msgid "Is New List"
 msgstr "Är ny lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Spara lista som VCard"
 
@@ -2492,13 +2516,13 @@ msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
@@ -2515,101 +2539,101 @@ msgid "Type"
 msgstr "Typ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Adressbok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Ny kontaktlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Gå till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Importera..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Sök efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbokskällor..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilotinställningar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressbok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressbok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopiera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Aktuell vy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2622,8 +2646,8 @@ msgstr ""
 "det igen"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Alla kategorier"
 
@@ -2666,7 +2690,7 @@ msgid "Company Phone"
 msgstr "Företagets telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
@@ -2728,7 +2752,7 @@ msgid "Nickname"
 msgstr "Smeknamn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Notering"
 
@@ -2737,7 +2761,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Organisation"
 
@@ -2865,68 +2889,74 @@ msgstr "Markerad"
 msgid "Has Cursor"
 msgstr "Har markör"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Medlemmar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Jobb"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupp"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "_Jobbtitel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax hem"
@@ -2936,8 +2966,8 @@ msgid "Success"
 msgstr "Lyckades"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2969,7 +2999,7 @@ msgstr "Protokollet stöds inte"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2989,7 +3019,8 @@ msgid "TLS not Available"
 msgstr "TLS är inte tillgänglig"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adressboken finns inte"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3131,7 +3162,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Lägg till adress till befintliga kontakten \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Undersöker adressboken..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3190,18 +3222,38 @@ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr "Detta är ett test av reflow canvas-elementet"
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolutions LDIF-importör"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolutions VCard-importör"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolutions VCard-importör"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Skriv _ut kontakter..."
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Skriv _ut kontakter..."
@@ -3294,7 +3346,7 @@ msgstr "Marginaler"
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Alternativ"
 
@@ -3480,8 +3532,8 @@ msgstr "Inget filnamn är angivet."
 msgid "Unnamed List"
 msgstr "Namnlös lista"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Ange lösenord"
@@ -3562,10 +3614,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolutions testkomponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Uppgifter"
 
@@ -3609,26 +3660,24 @@ msgstr "Slumringstid (minuter)"
 msgid "_Edit appointment"
 msgstr "_Redigera möte"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Öppna"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Öppna"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3637,12 +3686,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Varning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3654,7 +3703,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3671,19 +3720,19 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunde inte initiera gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
@@ -3829,24 +3878,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Beskrivningen innehåller"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3880,7 +3935,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3902,76 +3957,76 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nya Kaledonien"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Nya Kaledonien"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alender:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4105,7 +4160,7 @@ msgstr "timme"
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4178,7 +4233,7 @@ msgid "hour(s)"
 msgstr "timme/timmar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -4189,7 +4244,7 @@ msgstr "start på möte"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Aktiverad"
 
@@ -4241,7 +4296,7 @@ msgstr "30 minuter"
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Varningar"
 
@@ -4266,7 +4321,7 @@ msgid "Days"
 msgstr "dag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "A_ktivera"
 
@@ -4409,7 +4464,7 @@ msgid "_Fri"
 msgstr "_fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "Allm_änt"
 
@@ -4513,7 +4568,7 @@ msgstr ""
 "här."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Uppgiftslista"
@@ -4693,23 +4748,23 @@ msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " till "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Färdigt "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Ska utföras "
 
@@ -4745,8 +4800,8 @@ msgstr "Dagbokspost - %s"
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Spara som..."
 
@@ -4777,11 +4832,21 @@ msgstr "Avbryt åtgärd"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Kalender"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Uppgiftslista"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4888,7 +4953,7 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Möte"
 
@@ -4912,23 +4977,31 @@ msgstr "Schemaläggning"
 msgid "Meeting"
 msgstr "Sammanträde"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Åtkomst nekas för öppnande av kalendern"
@@ -5009,29 +5082,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
@@ -5228,7 +5301,7 @@ msgstr "den"
 msgid "occurrences"
 msgstr "förekomster"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Datum/tid:"
@@ -5265,7 +5338,7 @@ msgid "_No recurrence"
 msgstr "_Ingen upprepning"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -5307,7 +5380,7 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Förkasta ändringar"
 
@@ -5331,7 +5404,7 @@ msgstr "Uppgiftstilldelningsinformationen har ändrats. Skicka den?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Uppgiftsinformationen har ändrats. Skicka en uppdaterad version?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Utförtdatumet är fel"
 
@@ -5344,7 +5417,7 @@ msgstr "% färdigt"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Färdigt"
 
@@ -5357,7 +5430,7 @@ msgstr "Hög"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Pågår"
 
@@ -5376,7 +5449,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Inte startad"
 
@@ -5418,16 +5491,16 @@ msgstr "Grundläggande"
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna adressboken"
@@ -5438,7 +5511,7 @@ msgstr "_Konfidentiellt"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -5631,11 +5704,10 @@ msgstr "Startdatum"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "färg"
 
@@ -5661,7 +5733,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Ö"
 
@@ -5696,10 +5768,10 @@ msgstr "Nej"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Okänd"
@@ -5712,99 +5784,105 @@ msgstr "Återkommande"
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Öppna"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Inställningar..."
 
@@ -5892,7 +5970,7 @@ msgid "Alarms"
 msgstr "Alarm"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -5950,26 +6028,26 @@ msgstr "%02i minutdivisioner"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "em"
@@ -6151,7 +6229,7 @@ msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -6610,12 +6688,12 @@ msgstr "_Prioritet:"
 msgid "Web Page:"
 msgstr "Sida"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att lägga till en uppgift"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6625,7 +6703,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6633,12 +6711,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6647,29 +6725,39 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Läser in bilder"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Läser in bilder"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Inga möten"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Öppna i %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6789,16 +6877,16 @@ msgstr "Ledig-/upptageninformation (%s till %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-information"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Ange lösenord för %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6806,7 +6894,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6814,12 +6902,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7008,49 +7096,49 @@ msgstr "Markerad månad (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Uppgift"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Skriv ut objekt"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
@@ -7059,39 +7147,39 @@ msgstr "Skrivarinställningar"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7149,20 +7237,20 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Publik mapp som innehåller möten och evenemang"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Kalenderevenemang"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7170,7 +7258,7 @@ msgstr ""
 "Evolution har hittat Gnome-kalenderfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
@@ -8832,7 +8920,7 @@ msgstr "Kan inte öppna meddelande"
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
@@ -8918,7 +9006,7 @@ msgstr "Kopierar meddelanden"
 msgid "Filtering new message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8929,15 +9017,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Misslyckades med att tolka gpg-tips för användarid."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Misslyckades med att tolka gpg-lösenfrasbegäran."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8946,31 +9034,27 @@ 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:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oväntat svar från GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Inga data tillhandahållna"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Misslyckades med att kryptera: inga giltiga mottagare angivna."
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8981,34 +9065,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Misslyckades med att GPG:a %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Misslyckades med att köra gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att köra gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9016,28 +9100,28 @@ 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indexera innehåll i meddelandetext"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunde inte hämta meddelande från redigeraren"
@@ -9148,21 +9232,34 @@ msgstr "Misslyckades med att dekryptera MIME-del: ogiltig struktur"
 msgid "parse error"
 msgstr "tolkningsfel"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "E-postleverantör för virtuell mapp"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "För läsande av e-post som en fråga av en annan samling mappar"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunde inte läsa in %s: Modulinläsning stöds inte på detta system."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunde inte läsa in %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initieringskod i modulen."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Det finns ingen leverantör för protokollet \"%s\""
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonym"
@@ -9325,7 +9422,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -9465,20 +9562,7 @@ msgstr "Uppslagning av värdnamn misslyckades: värden kunde inte hittas"
 msgid "Host lookup failed: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: okänd orsak"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "E-postleverantör för virtuell mapp"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "För läsande av e-post som en fråga av en annan samling mappar"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Det finns ingen leverantör för protokollet \"%s\""
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9548,21 +9632,25 @@ msgstr "Server: %s, typ: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Kan inte få mapp: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9797,21 +9885,31 @@ msgstr "Det finns inget sådant meddelande %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, 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:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9829,16 +9927,11 @@ msgstr "Tillämpa filtren på nya meddelanden i INBOX på denna server"
 
 # Låter konstigt
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adressbok"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9858,43 +9951,41 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Lösenord"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Standard"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Kraftigt fuktdis"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9903,26 +9994,26 @@ msgstr ""
 "Varning från IMAP-servern %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Oväntat svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut för tidigt."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Oväntat OK-svar från IMAP-servern: %s"
@@ -9937,7 +10028,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen förstördes och återskapades på servern."
 
@@ -9946,12 +10037,12 @@ msgstr "Mappen förstördes och återskapades på servern."
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan inte hämta meddelande: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9967,25 +10058,25 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 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:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -10043,27 +10134,37 @@ msgstr "Namnrymd"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Tillämpa filtren på nya meddelanden i INBOX på denna server"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Kontrollera nya meddelanden i alla mappar"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Kontrollera nya meddelanden i alla mappar"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, 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:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10072,65 +10173,65 @@ msgstr "IMAP-tjänst för %s på %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10141,24 +10242,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Kan inte få mapp: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappnamnet \"%s\" är ogiltigt eftersom det innehåller tecknet \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Okänd föräldermapp: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
@@ -10180,7 +10289,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kunde inte ansluta till POP-servern %s"
@@ -10264,8 +10373,8 @@ msgstr ""
 "Mutt-typ."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10277,55 +10386,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunde inte spara sammanfattningen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
@@ -10343,53 +10452,44 @@ msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte öppna mappen \"%s\":\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" är inte en brevlådekatalog."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10411,9 +10511,9 @@ msgid "Checking for new messages"
 msgstr "Kontrollerar nya meddelanden"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Lagrar mapp"
@@ -10457,159 +10557,137 @@ msgstr "Mappen verkar vara obotligt skadad."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Kan inte öppna filen \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Kan inte skapa en mapp med det namnet"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte skapa katalogen %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Kan inte bifoga filen %s: inte en vanlig fil"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Kunde inte skapa filen \"%s\":\n"
+"Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" är ingen vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte ta bort mappen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Kan inte skapa en mapp med det namnet"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-ID finns redan"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Det angivna mappnamnet är inte giltigt: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunde inte öppna mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ödesdigert e-posttolkningsfel nära position %ld i mappen %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stänga temporära mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summeringen stämmer inte överens, även efter en synk"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunde inte lagra mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fel vid skrivning av temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
@@ -10623,10 +10701,17 @@ msgstr "MH-meddelandetillägg avbrutet"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" är inte en katalog."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Kan inte få mapp: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10648,6 +10733,29 @@ msgstr "Spoolen \"%s\" är ingen vanlig fil eller katalog"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Kunde inte öppna mappen \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Mappen \"%s\" finns inte."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10883,47 +10991,47 @@ msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan inte flytta en mapp till en av dess undermappar."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Det finns ingen sådan mapp: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kunde inte hämta grupp: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Kunde inte hämta meddelande: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-kommandot misslyckades: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Letar efter nya meddelanden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Okänt serversvar: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Använd avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Åtgärden misslyckades: %s"
@@ -10970,7 +11078,7 @@ msgstr "Ta bort efter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Inaktivera stöd för alla POP3-tillägg"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11060,7 +11168,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11114,7 +11222,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11282,7 +11390,7 @@ msgstr "SMTP-epostleverans via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan inte skicka meddelande: avsändaradressen är inte giltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
@@ -11389,34 +11497,34 @@ msgstr "QUIT-begäran gjorde time-out: %s"
 msgid "QUIT response error"
 msgstr "Fel i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f k"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f M"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "bilaga"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Ta bort markerade objekt från bifogningslistan"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
@@ -11537,20 +11645,20 @@ msgstr "<klicka här för att välja en mapp>"
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11559,30 +11667,30 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11591,7 +11699,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11600,7 +11708,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11609,7 +11717,7 @@ msgstr ""
 "Kan inte kopiera filhandtag: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11618,7 +11726,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11627,7 +11735,7 @@ msgstr ""
 "Ximian Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du försöka återställa dem?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11638,43 +11746,43 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11682,7 +11790,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11694,7 +11802,7 @@ msgstr ""
 "Försäkra dig om att du har rätt versioner av\n"
 "gtkhtml och libgtkhtml installerade.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11702,7 +11810,7 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12058,7 +12166,7 @@ msgstr "Då"
 msgid "You must specify a folder."
 msgstr "Du måste ange en mapp."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Välj mapp"
@@ -12073,19 +12181,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "viktigt"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Att-göra"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Senare"
 
@@ -12174,7 +12282,7 @@ msgstr ""
 "Meddelandedatumet kommer att jämföras med\n"
 "den aktuella tiden då filtreringen körs."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
@@ -12190,7 +12298,7 @@ msgstr "sedan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekunder"
 
@@ -12360,7 +12468,7 @@ msgstr "är inte flaggad"
 msgid "Junk Test"
 msgstr "juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12469,9 +12577,10 @@ msgstr "börjar med"
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Ämne"
 
@@ -12479,25 +12588,25 @@ msgstr "Ämne"
 msgid "Unset Status"
 msgstr "Töm status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnamnet \"%s\" är inte unikt, välj ett annat."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Lägg till regel"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -12537,15 +12646,15 @@ msgstr "Ämnet innehåller"
 msgid "Subject does not contain"
 msgstr "Ämnet innehåller inte"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Du måste ge denna virtuella mapp ett namn."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du måste ange minst en mapp som källa."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Källa för virtuell mapp"
 
@@ -12597,9 +12706,9 @@ msgstr "Evolutions e-postmappvisare"
 msgid "Evolution Mail preferences control"
 msgstr "Evolutions e-postinställningskontroll"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "E-post"
 
@@ -12607,7 +12716,7 @@ msgstr "E-post"
 msgid "Mail Accounts"
 msgstr "E-postkonton"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "E-postinställningar"
 
@@ -12645,15 +12754,15 @@ msgstr "Du måste ange ett giltigt skriptnamn."
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Lägg till skriptsignatur"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
@@ -12740,7 +12849,6 @@ msgid "Unread messages"
 msgstr "Nästa _olästa meddelande"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
@@ -12748,310 +12856,327 @@ msgstr "<klicka här för att välja en mapp>"
 msgid "Create New Folder"
 msgstr "Skapa ny mapp"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, fuzzy, c-format
 msgid "%s"
 msgstr "s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Skapa en ny mapp"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Verkligen ta bort mappen \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ta bort \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Öppna i nytt fönster"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Flytta"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "Föl_j upp..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovi_ktigt"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytta till mapp..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adress_boken"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Till_ämpa filter"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Virtuell mapp på avsändare"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrera på _avsändare"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Standard"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att lägga till en uppgift"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Träffar:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Tilldelad"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Redigera signatur"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Redigera signatur"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13060,85 +13185,85 @@ msgstr ""
 "input_token innehåller en ogiltig signatur, eller en signatur som inte kunde "
 "verifieras."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "kryptera"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "kryptera"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikatet är inte giltigt ännu"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %H.%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %H.%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Visa inuti"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Dölj"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
@@ -13182,29 +13307,34 @@ msgstr "Pekare till okänd extern data (typen \"%s\")"
 msgid "Formatting message"
 msgstr "Flyttar meddelanden"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Från"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -13218,8 +13348,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13237,21 +13367,26 @@ msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Schemat stöds inte"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Kan inte verifiera lövsignatur"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Kan inte verifiera lövsignatur"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13263,61 +13398,61 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Misslyckades med att cacha %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Misslyckades med att cacha %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Misslyckades med att skapa rör till \"%s\": %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Misslyckades med att slå upp värden \"%s\": %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Namnlöst meddelande"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bakgrund:"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Svara till avsändaren"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Skicka _meddelande till lista..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Lägg till adressbok"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
@@ -13367,18 +13502,18 @@ msgstr "Filter"
 msgid "-------- Forwarded Message --------"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13387,7 +13522,7 @@ msgstr ""
 "Kan inte spara till \"%s\":\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13396,32 +13531,38 @@ msgstr ""
 "\"%s\" finns redan.\n"
 "Vill du skriva över den?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Meddelande"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Spara meddelande som..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Adress"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Öppnar meddelanden från \"%s\""
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13435,7 +13576,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13464,324 +13605,332 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Standardämne för meddelandet."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Standardämne för meddelandet."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Standardämne för meddelandet."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Standardämne för meddelandet."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Växla om mappraden ska visas"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Växla om mappraden ska visas"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Töm _papperskorgsmappar vid avslut"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Töm _papperskorgsmappar vid avslut"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Skicka meddelandet senare"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Lista med signaturer"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Notifiering om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Notifiering om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 #, 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:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Skicka brev i HTML-format som standard."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Skicka brev i HTML-format som standard."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Visa animerade bilder"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Visa animerade bilder"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Visa meddelanden i normal stil"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "F_örhandsgranskningspanel"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Spela ljudfil då ny post anländer"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Stavnings_kontroll"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminaltypsnitt:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13789,173 +13938,170 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Tråda meddelandelista"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Tråda meddelandelista"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Thread the message-list based on Subject"
 msgstr "Tråda meddelandelista"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Gör detta till mitt standardkonto"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "V_ariabelt breddsteg:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Importera"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolutions mbox-importör"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolutions Pine-importör"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerar..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Var vänlig vänta"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importerar %s som %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Genomsöker %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Importerar data"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13963,16 +14109,44 @@ msgstr ""
 "Evolution har hittat e-postfiler från Elm.\n"
 "Vill du importera dem till Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Ta bort denna mapp"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Välj importör"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importerar"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Viktig post"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Genomsöker %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13998,7 +14172,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:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14010,7 +14184,7 @@ msgstr ""
 "tråd\", som inte stöds i Evolution.\n"
 "Dessa filter kommer att kastas."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14024,31 +14198,24 @@ msgstr ""
 "ändrades till att testa huruvida den strängen finns\n"
 "eller inte finns i meddelandetexten."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Genomsöker e-postfilter"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Genomsöker katalog"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Startar import"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Importerar data"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Inställningar"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "E-postfilter"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14056,11 +14223,20 @@ msgstr ""
 "Evolution har hittat Netscape-epostfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerar din gamla Pine-data"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Importerar data"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adressbok"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14068,7 +14244,7 @@ msgstr ""
 "Evolution har hittat Pine-epostfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14111,19 +14287,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har inte fyllt i all nödvändig information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Sökväg:"
 
@@ -14175,28 +14351,43 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har oskickade meddelanden, vill du ändå avsluta?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Ny virtuell mapp"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-postfilter"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Skriv ett nytt e-brev"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI:n som kalendern kommer att visa"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14238,7 +14429,7 @@ msgstr ""
 "Ange information om hur du vill skicka e-post. Om du inte är säker bör du "
 "fråga din systemadministratör eller Internetleverantör."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Kontohantering"
 
@@ -14264,121 +14455,116 @@ msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Lägg till sk_ript"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Lägg till ny signatur..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Skicka alltid _blindkopia (Bcc) till:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Skicka alltid _kopia (Cc) till:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Lita alltid på nycklar i min nyckelring vid kryptering"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Bifoga originalmeddelandet"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Te_ckenkodning:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "F_ärger"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Server för inkommande post"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Kontrollera stavning medan jag skri_ver"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Kontrollerar ny e-post"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Färg för _felstavade ord:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Redigerar meddelanden"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14393,143 +14579,139 @@ msgstr ""
 "\n"
 "Klicka på \"Verkställ\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Standardbeteende"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Standardtecken_kodning: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Tar bort post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Citera inte originalmeddelandet"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signera inte _sammanträdesbegäran (för kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Utkast_mapp:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-postkonton"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-post_adress:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Töm _papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Fast _breddsteg:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Färre alternativ"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Typsnittsegenskaper"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Formatera meddelanden med _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Rubrik"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiketter och färger"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Läser in bilder"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Meddelanderedigerare"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Meddelandevisning"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "Meddelandetypsnitt"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14537,140 +14719,140 @@ msgstr ""
 "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för "
 "första gången"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Utskrivna typsnitt"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citera originalmeddelande"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Ko_m ihåg detta lösenord"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Kom ihåg detta _lösenord"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Återställ standardalternativ"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "S_äkerhet"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Säker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Kunde inte signera: certifikat hittades inte för \"%s\"."
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Stavnings_kontroll"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14680,7 +14862,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14689,7 +14871,7 @@ msgstr ""
 "Denna sida låter dig konfigurera stavningskontroll och språk. Listan med "
 "språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14697,15 +14879,15 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: \"Jobb\" eller \"Personligt\"."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14715,175 +14897,175 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Infoga _automatiskt smilisbilder"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Standardsignatur:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Standardvärden"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Fullständigt namn:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "juni"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga då meddelanden skickas med en _tom ämnesrad"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Mottagande av post"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "_Återställ standardalternativ"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Ta bort..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "_Skickande av post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Visa animerade bilder"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminaltypsnitt:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Använd säker anslutning (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14906,7 +15088,7 @@ msgstr ""
 "Fel vid utförande av åtgärd:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Arbetar"
 
@@ -14918,128 +15100,128 @@ msgstr "Filtrerar mapp"
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Misslyckades med att lagra e-post i temporära filen %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Meddelande %d av %d misslyckades"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15048,7 +15230,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15057,11 +15239,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15070,22 +15252,22 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15120,38 +15302,38 @@ msgstr "kryptera"
 msgid "Security Information"
 msgstr "Källinformation"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, typ: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sökväg: %s, typ: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Avbryt _allt"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Väntar..."
 
@@ -15260,20 +15442,20 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Försöker redigera en virtuell mapp \"%s\" som inte finns."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
@@ -15603,97 +15785,20 @@ msgstr "Frånkopplingsmappar"
 msgid "Autocompletion Folders"
 msgstr "Mappar för automatisk ifyllning"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Kan inte kopiera mapp: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Kan inte flytta mapp: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Kan inte flytta en mapp till sig själv."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Kan inte kopiera en mapp till sig själv."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Kan inte flytta en mapp till en av dess undermappar."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Ange en mapp att kopiera mappen \"%s\" till:"
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Kopiera mapp"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Ange en mapp att flytta mappen \"%s\" till:"
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Flytta mapp"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Kan inte ta bort mapp:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Verkligen ta bort mappen \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Kan inte byta namn på mapp:\n"
+"Kan inte skapa den angivna katalogen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Det angivna mappnamnet är inte giltigt: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Den valda mappen tillhör inte en annan användare"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Kan inte ta bort mappen:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Kan inte skapa den angivna katalogen:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namnlös)"
@@ -15834,7 +15939,7 @@ msgstr "Misslyckades med att köra gpg."
 msgid "_Import"
 msgstr "Importera"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Kopplar från anslutningar..."
 
@@ -15872,6 +15977,10 @@ msgstr "Kunde inte öppna den delade mappen: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Kan inte skapa den angivna utdelade mappen."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Startar import"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15981,123 +16090,6 @@ msgstr "Konfigurationsdatabasen hittades inte"
 msgid "Generic error"
 msgstr "Allmänt fel"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Skapa en ny genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Gruppnamn:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Vill du verkligen ta bort gruppen \"%s\" från genvägsraden?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Byt namn på genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Byt namn på den markerade genvägsgruppen till:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Visa genvägarna som små ikoner"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "S_tora ikoner"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Visa genvägarna som stora ikoner"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Lägg till grupp..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Skapa en ny genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_Ta bort denna grupp..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Ta bort denna genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Byt namn på denna grupp..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Byt namn på denna genvägsgrupp"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "_Dölj genvägsraden"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "_Visa genvägsraden"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Skapa _standardgenvägar"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Skapa standardgenvägar"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Byt namn på genväg"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Byt namn på den markerade genvägen till:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Öppna mappen som är länkad till denna genväg"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "_Öppna i nytt fönster"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Öppna mappen som är länkad till denna genväg i ett nytt fönster"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Byt namn på denna genväg"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Ta bort"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Ta bort denna genväg från genvägsraden"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Fel vid sparande av genvägar."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Genvägar"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kryssruta"
@@ -16108,11 +16100,6 @@ msgstr "Kryssruta"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" i \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16416,52 +16403,52 @@ msgstr ""
 "%s: --online och --offline kan inte användas tillsammans.\n"
 "  Använd %s --help för mer information.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Välj importör"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Förlopp"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Uttryck"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadress:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Certifikatet har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Ange lösenord för %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
@@ -16470,7 +16457,7 @@ msgstr ""
 "Utställare: %s\n"
 "Ämne: %s"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
@@ -16541,7 +16528,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Certifikat-ID:"
@@ -16617,11 +16604,11 @@ msgstr "Organisationsenhet"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16670,242 +16657,242 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-ID finns redan"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " °C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Certifikatet opålitligt"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Publik nyckel: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Ämnet är %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Ogiltig certifikatmyndighet (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Ogiltig certifikatmyndighet (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen information"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "bilaga"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitaba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Uttryck"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s vid %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Certifikatsignaturfel"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Infoga"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Ämnet är %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfel"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Ange lösenord för %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Certifikat-ID:"
@@ -17505,7 +17492,8 @@ msgid "_Threaded Message List"
 msgstr "_Trådad meddelandelista"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "L_ägg till avsändaren i adressboken"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17513,7 +17501,8 @@ msgid "A_pply Filters"
 msgstr "Tillä_mpa filter"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Lägg till avsändaren i adressboken"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17967,10 +17956,6 @@ msgstr "For_mat"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Öppna"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Öppna en fil"
@@ -18342,22 +18327,6 @@ msgstr "_Skicka / Ta emot"
 msgid "_Window"
 msgstr "_Sök nu"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Skriv ut sammanfattning"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Skriv ut sammanfattning"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Läs om"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Läs om vyn"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Efter företa_g"
@@ -18424,8 +18393,8 @@ msgstr "Med _kategori"
 msgid "_Tasks"
 msgstr "_Uppgifter"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18672,23 +18641,23 @@ msgstr "_Sök"
 msgid "_Find Now"
 msgstr "_Sök nu"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Töm"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Underobjekt-ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Sök nu"
@@ -18703,6 +18672,206 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adressbokskällor"
+
+#~ msgid "No data provided"
+#~ msgstr "Inga data tillhandahållna"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan inte öppna filen \"%s\":\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte skapa katalogen %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte skapa filen \"%s\":\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "\"%s\" är inte en katalog."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Importerar %s som %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Genomsöker e-postfilter"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Genomsöker katalog"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Kan inte kopiera mapp: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Kan inte flytta mapp: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Kan inte flytta en mapp till sig själv."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Kan inte kopiera en mapp till sig själv."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Kan inte flytta en mapp till en av dess undermappar."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Ange en mapp att kopiera mappen \"%s\" till:"
+
+#~ msgid "Copy Folder"
+#~ msgstr "Kopiera mapp"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Ange en mapp att flytta mappen \"%s\" till:"
+
+#~ msgid "Move Folder"
+#~ msgstr "Flytta mapp"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan inte ta bort mapp:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Verkligen ta bort mappen \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan inte byta namn på mapp:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Den valda mappen tillhör inte en annan användare"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan inte ta bort mappen:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Skapa en ny genvägsgrupp"
+
+#~ msgid "Group name:"
+#~ msgstr "Gruppnamn:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Vill du verkligen ta bort gruppen \"%s\" från genvägsraden?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Byt namn på genvägsgrupp"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Byt namn på den markerade genvägsgruppen till:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Små ikoner"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Visa genvägarna som små ikoner"
+
+#~ msgid "_Large Icons"
+#~ msgstr "S_tora ikoner"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Visa genvägarna som stora ikoner"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Lägg till grupp..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Skapa en ny genvägsgrupp"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_Ta bort denna grupp..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Ta bort denna genvägsgrupp"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Byt namn på denna grupp..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Byt namn på denna genvägsgrupp"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "_Dölj genvägsraden"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "_Visa genvägsraden"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Skapa _standardgenvägar"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Skapa standardgenvägar"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Byt namn på genväg"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Byt namn på den markerade genvägen till:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Öppna mappen som är länkad till denna genväg"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "_Öppna i nytt fönster"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Öppna mappen som är länkad till denna genväg i ett nytt fönster"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Byt namn på denna genväg"
+
+#~ msgid "Re_move"
+#~ msgstr "_Ta bort"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Ta bort denna genväg från genvägsraden"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Fel vid sparande av genvägar."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Genvägar"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" i \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Skriv ut sammanfattning"
+
+#~ msgid "Print summary"
+#~ msgstr "Skriv ut sammanfattning"
+
+#~ msgid "Reload"
+#~ msgstr "Läs om"
+
+#~ msgid "Reload the view"
+#~ msgstr "Läs om vyn"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Kopiera till mapp..."
 
@@ -19356,25 +19525,10 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "List Show Addresses"
 #~ msgstr "Lista visningsadresser"
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolutions LDIF-importör"
-
 #, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Evolutions LDIF-importör"
 
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "LDAP Data Interchange Format (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolutions VCard-importör"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolutions VCard-importör"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Searching..."
 #~ msgstr "Söker..."
 
@@ -27858,9 +28012,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Moderate mist"
 #~ msgstr "Måttligt fuktdis"
 
-#~ msgid "Thick mist"
-#~ msgstr "Kraftigt fuktdis"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Låga bankar med fuktdis"
 
@@ -28386,9 +28537,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Skapa ett nytt fönster som visar denna mapp"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Ta bort denna mapp"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Visa en annan mapp"
 
@@ -28631,9 +28779,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Reminder!"
 #~ msgstr "Påminnelse!"
 
-#~ msgid "Important mail"
-#~ msgstr "Viktig post"
-
 #~ msgid "Unread mail"
 #~ msgstr "Oläst post"
 
@@ -28827,9 +28972,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Wombat InterfaceCheck interface"
 #~ msgstr "Wombat-gränssnittskontrollsgränssnitt"
 
-#~ msgid "No appointments"
-#~ msgstr "Inga möten"
-
 #~ msgid "%l:%M %d %B"
 #~ msgstr "%l.%M %d %B"
 
@@ -29212,9 +29354,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Attach files"
 #~ msgstr "Bifoga filer"
 
-#~ msgid "Mail Filter"
-#~ msgstr "E-postfilter"
-
 #~ msgid "Languages"
 #~ msgstr "Språk"
 
@@ -30549,9 +30688,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "First Run Setup Assistant"
 #~ msgstr "Förstagångsassistent"
 
-#~ msgid "Importing Data"
-#~ msgstr "Importerar data"
-
 #~ msgid "Setup Assistant"
 #~ msgstr "Konfigurationsassistent"
 
@@ -31660,9 +31796,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Add a new service to the Executive Summary"
 #~ msgstr "Lägg till ny tjänst till sammanfattningen"
 
-#~ msgid "Create a new email"
-#~ msgstr "Skriv ett nytt e-brev"
-
 #~ msgid "Edit Task"
 #~ msgstr "Redigera uppgift"
 
@@ -32424,9 +32557,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Öppnar meddelanden från mappen \"%s\""
 
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Öppnar meddelanden från \"%s\""
-
 #~ msgid "Viewing messages from folder \"%s\""
 #~ msgstr "Visar meddelanden från mappen \"%s\""
 
diff --git a/po/tr.po b/po/tr.po
index 0e48481bf5..5009717607 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -46,8 +46,7 @@ msgstr "Posta hesaplarını buradan yapılandırın"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Bağlantılar"
 
@@ -90,19 +89,20 @@ msgstr "E-posta özet bileşen mimarisi"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -110,65 +110,65 @@ msgstr "Yeni Adres Defteri"
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Özellikler..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Yeni Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Yeni bir bağlantı yarat"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Yeni Bağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "B_ağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Yeni bir bağlantı listesi yarat"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Root DSE üzerinde tarama yapılamadı"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Şema bilgisini yüklerken hata oluştu"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "Geçiş yapılıyor..."
 
@@ -181,41 +181,43 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' geçiş yapılıyor:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "Bu Bilgisayarda"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Kişisel"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "LDAP Sunucuları Üzerinde"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Sunucuları Üzerinde"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Otomatik Tamamlama"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -223,7 +225,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -234,19 +236,19 @@ msgstr ""
 "tanımlanmış zaman sınırını aştı. Lütfen aramayı daraltın, ya da bu \n"
 "adres defteri için tanımlanmış süreyi artırın."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Bu arama başarısızlıkla sonuçlandı."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -255,7 +257,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
 "olmadığınızı ve dosyanın yerini kontrol edin."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -264,7 +266,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -276,7 +278,7 @@ msgstr ""
 "programı CVS kaynaklarından alacağınız openLDAP desteği\n"
 "ile kurmalısınız:\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -285,27 +287,32 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Adres defterini açamadım"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Kimlik denetimi yapılamadı.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s için parolayı girin (kullanıcı: %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 msgid "UID of the contacts source that the view will display"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "Takvimin gösterecek olduğu URI"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -349,7 +356,7 @@ msgstr "_Desteklenen Türleri Denetle "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -381,20 +388,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "Adres Defteri Oluşturma Sihirbazı"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Adres Defteri Kaynakları"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Adres Defteri Kaynakları"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Adres Defteri Kaynakları..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Her zaman"
 
@@ -405,7 +414,8 @@ msgstr "Anonim"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -413,50 +423,50 @@ msgstr ""
 "\n"
 "Lütfen girdiğiniz bilgileri tamamlamak için \"Bitir\" düğmesine tıklayın."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Bağlantı"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "_DN:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Tamamlandı"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Genel"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Grup:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -473,30 +483,30 @@ msgstr ""
 "yer alıp almadığını LDAP sunucu yöneticinize sorarak kolayca "
 "öğrenebilirsiniz."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Biri"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Arama"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Seçilen:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -513,7 +523,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:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -526,7 +536,7 @@ 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:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -534,41 +544,42 @@ msgid ""
 "searches, and for creating and editing contacts. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Son adımda bu LDAP sunucunun ekranda hangi isimle görüntüleneceğini "
 "belirtmelisiniz."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "1. Adım: Dizin Özellikleri"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "2. Adım: Sunucu Bilgisi"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "3. Adım: Sunucuya Bağlantı"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "4. Adım: Dizin Arama"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Desteklenen Arama Tabanları"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -582,7 +593,7 @@ msgstr ""
 "değiştirmeden \n"
 "önce sistem yöneticinize danışın. "
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -590,7 +601,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -600,12 +611,13 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -617,34 +629,34 @@ msgstr ""
 "detaylı bilgiye sahip olmalısınız. Lütfen bu bilgiler için \n"
 "gerekiyorsa sistem yöneticiniz ile görüşün."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -652,7 +664,7 @@ msgid ""
 "display purposes only. "
 msgstr "Bu, Evolution dizin listesinde görüntülenecek olan isimdir."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -665,28 +677,28 @@ msgstr ""
 "kullanılacağını \n"
 "öğrenmek için sistem yöneticinize danışın."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TLS kullan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "DN kullanarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "E-posta adresi kullanılarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Ne zaman mümkünse"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -698,19 +710,19 @@ msgstr ""
 "giriş bilgilerinizdir. Lütfen bu konuda emin değilseniz sistem yöneticinize "
 "danışın."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Görüntülenecek isim:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -719,39 +731,39 @@ msgstr "İ_ndirme sınırı:"
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "_Giriş yöntemi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Port numarası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "_Sunucu adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "_Zaman aşımı süresi (dakika):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "kart"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "bağlantı-sekmesi"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "genel-sekme"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "arama sekmesi"
 
@@ -872,7 +884,7 @@ msgstr "Takım çalışması"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Bağlantı Düzenleyici"
 
@@ -969,10 +981,10 @@ msgstr "_Kategoriler..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1020,15 +1032,15 @@ msgid "_Web page address:"
 msgstr "W_eb sayfası adresi:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Addres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2020,106 +2032,114 @@ msgid "AOL Instant Messenger"
 msgstr "İ_letiyi Gönder"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_İletiyi Gönder"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Servis hazır"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Konum: "
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "_Kullanıcı adı:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Ev"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "İş"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Diğer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr "Kaynak Kitabı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Bağlantı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "Bu Yeni Bir Bağlantı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Düzenlenebilir Alanlar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Değiştirildi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Hesap Adı:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Kategori düzenleyici bulunamadı."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 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:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Bağlantıyı VCard olarak kaydet"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2127,7 +2147,7 @@ msgstr ""
 "Gerçekten bu bağlantları\n"
 "silmek istiyor musunuz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2135,47 +2155,52 @@ msgstr ""
 "Gerçekten bu bağlantıyı\n"
 "silmek istiyor musunuz?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grup"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Bağlantıyı Hızlı Ekle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "_Tümünü Düzenle"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "_Tam İsim:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "_E-posta:"
 
@@ -2334,11 +2359,11 @@ msgid "Is New List"
 msgstr "Yeni Liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Bağlantı Listesi Düzenleyici"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Listeyi VCard Olarak Kaydet"
 
@@ -2427,13 +2452,13 @@ msgid "Email begins with"
 msgstr "E-posta başlar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Herhangi bir alanın içeriği"
 
@@ -2450,101 +2475,101 @@ msgid "Type"
 msgstr "Tür"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
-msgstr "Adres Defteri"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "Adres Defteri:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Yeni Bağlantı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Yeni Bağlantı Listesi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Dizine Git..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Al..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Bağlantıları Ara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adres Defteri Kaynakları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot Ayarları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Bağlantıyı Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Zarfı Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adres Defteri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adres Defteri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kes"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Kopyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2553,8 +2578,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
 
@@ -2597,7 +2622,7 @@ msgid "Company Phone"
 msgstr "Şirket Telefonu"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-posta"
 
@@ -2658,7 +2683,7 @@ msgid "Nickname"
 msgstr "Lakap"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Not"
 
@@ -2667,7 +2692,7 @@ msgid "Office"
 msgstr "Ofis"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Kurum"
 
@@ -2794,66 +2819,72 @@ msgstr "Seçili"
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "Liste Üyeleri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "İş"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grup"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Kişisel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "Meslek Tanımı"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr "Web sayfası"
 
@@ -2862,8 +2893,8 @@ msgid "Success"
 msgstr "Başarıldı"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2894,7 +2925,7 @@ msgstr "Protokol desteklenmiyor"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2914,7 +2945,8 @@ msgid "TLS not Available"
 msgstr "TLS mevcut değil"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Adres defteri bulunamadı"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3054,7 +3086,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "\"%s\" bağlantısına adres ekle"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Adres Defterini Araştırılıyor..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3112,18 +3145,38 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution LDIF alıcısı"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Veri Aktarım Biçim (.ldif)"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution VCard Alıcısı"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolution VCard alıcısı"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "Zarfı yazdır"
 
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Seçili bağlantıları yazdır"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Seçili bağlantıları yazdır"
@@ -3216,7 +3269,7 @@ msgstr "Marjin"
 msgid "Number of columns:"
 msgstr "Sütun sayısı:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -3399,8 +3452,8 @@ msgstr "Dosya adı belirtilmedi."
 msgid "Unnamed List"
 msgstr "İsimsiz Liste"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Parolayı Girin"
@@ -3481,10 +3534,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Görevler"
 
@@ -3528,26 +3580,24 @@ msgstr "Dinlenme zamanı (dakika)"
 msgid "_Edit appointment"
 msgstr "_Toplantıyı düzenle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Aç"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Aç"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Açıklama yok."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3556,12 +3606,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Uyarı"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3569,7 +3619,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3580,19 +3630,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Tekrar sorma."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Gnome-vfs başlatılamıyor"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
 
@@ -3737,24 +3787,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Gün gezgininde tarih numaralarını göster"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Özet içeriği"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Tanım içeriği"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Açıklama içeriği"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Tanım içeriği"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Eşleme yok"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Takvim"
 
@@ -3787,7 +3843,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%d %b %a"
 
@@ -3809,75 +3865,75 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Yeni Kaledonya"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Yeni randevu"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Randevu"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Yeni bir randevu oluştur"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Yeni toplantı"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "_Toplantı"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Yeni bir toplantı isteği oluştur"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Yeni Tüm Gün Randevusu"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Tüm Gün Randevusu"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir tüm gün randevusu oluştur"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Yeni Kaledonya"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Takvim:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Yeni bir dizin yarat"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4012,7 +4068,7 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4085,7 +4141,7 @@ msgid "hour(s)"
 msgstr "saat"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -4096,7 +4152,7 @@ msgstr "randevu başlangıcı"
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Etkin"
 
@@ -4148,7 +4204,7 @@ msgstr "30 dakika"
 msgid "60 minutes"
 msgstr "60 dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Alarmlar"
 
@@ -4173,7 +4229,7 @@ msgid "Days"
 msgstr "Gün"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
@@ -4316,7 +4372,7 @@ msgid "_Fri"
 msgstr "_Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Genel"
 
@@ -4416,7 +4472,7 @@ msgstr ""
 "Lütfen girdiğiniz bilgileri tamamlamak için \"Bitir\" düğmesine tıklayın."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Görev Listesi"
@@ -4593,24 +4649,24 @@ msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
 msgid "Validation error: %s"
 msgstr "Onaylama hatası: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Tamamlanan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Tamamlanan "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 #, fuzzy
 msgid " (Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Tarihe göre "
 
@@ -4646,8 +4702,8 @@ msgstr ""
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
@@ -4676,9 +4732,20 @@ msgstr "Açıklama yok"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
-msgstr ""
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "Açıklama yok"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Takvim"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Yeni görev listesi"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4786,7 +4853,7 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Randevu"
 
@@ -4810,23 +4877,31 @@ msgstr "Zaman Düzenleme"
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Adres defterini açamadım"
@@ -4906,29 +4981,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "Seçilen organizatörün bir e-posta adresi bulunmuyor."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "En az bir katılan olmalıdır."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Dağıt..."
 
@@ -5117,7 +5192,7 @@ msgstr " "
 msgid "occurrences"
 msgstr "tekrarlar"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Tarih/Zaman"
 
@@ -5153,7 +5228,7 @@ msgid "_No recurrence"
 msgstr "_Tekrarlama yok"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Sil"
 
@@ -5195,7 +5270,7 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Değişiklikleri Sil"
 
@@ -5219,7 +5294,7 @@ msgstr "Görev bilgisi oluşturuldu. Gönderilsin mi?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Tamamlanma tarihi yanlış"
 
@@ -5232,7 +5307,7 @@ msgstr "_Biten %"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -5245,7 +5320,7 @@ msgstr "Yüksek"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "İşlemde"
 
@@ -5264,7 +5339,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Başlamadı"
 
@@ -5305,16 +5380,16 @@ msgstr "Temel"
 msgid "Assignment"
 msgstr "Görevlendirme"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Bitiş tarihi hatalı"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Adres defterini açamadım"
@@ -5325,7 +5400,7 @@ msgstr "_Gizli"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Açıklama:"
 
@@ -5517,11 +5592,10 @@ msgstr "Başlangıç Tarihi"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Özet"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "rengi ile tanımla"
 
@@ -5546,7 +5620,7 @@ msgstr "K"
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "D"
 
@@ -5581,10 +5655,10 @@ msgstr "Hayır"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Bilinmiyor"
@@ -5597,99 +5671,105 @@ msgstr "Tekrarlama"
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Seçilen bağlantılar siliniyor"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Öğeler güncelleniyor"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Yeni Toplantı"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Yazdır..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Bugüne Git"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Aç"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "_Toplantı Tarihi Ayarla..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_iCalendar olarak Yönlendir..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Ayarlar..."
 
@@ -5776,7 +5856,7 @@ msgid "Alarms"
 msgstr "Uyarılar"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Tamamlandı"
 
@@ -5834,26 +5914,26 @@ msgstr "%02i dakika bölmeleri"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "ös"
@@ -6036,7 +6116,7 @@ msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "İptal"
@@ -6489,12 +6569,12 @@ msgstr "Öncelik:"
 msgid "Web Page:"
 msgstr "Web Sayfası:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Görev eklemek için tıklayın"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6504,7 +6584,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6512,12 +6592,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s tarihinde görevler açılıyor"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6526,29 +6606,39 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Seçilen öğeler siliniyor..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Yüklenen Resimler"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Randevu yok."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s içinde aç..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6668,16 +6758,16 @@ msgstr "Boş/Meşgul bilgisi (%s -> %s)"
 msgid "iCalendar information"
 msgstr "iCalendar bilgisi"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6685,7 +6775,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6693,12 +6783,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6887,49 +6977,49 @@ msgstr "Seçili ay (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Seçili yıl (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Görev"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Durum: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Öncelik: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Biten Yüzde: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriler: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Bağlantılar: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Yazdırma Önizleme"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Öğeyi Yazdır"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
@@ -6938,36 +7028,36 @@ msgstr "Yazdırma Ayarları"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "Yeni görev listesi"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "_Görev Listesi"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "Yeni bir görev listesi oluştur"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7025,20 +7115,20 @@ msgstr "iCalendar dosyaları (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar dosyaları (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Randevu ve olayların bulunduğu genel dizin"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Hatırlatıcı!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Takvim Olayları"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7046,7 +7136,7 @@ msgstr ""
 "Evolution, Gnome Takvim dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome Takvimi"
 
@@ -8707,7 +8797,7 @@ msgstr "İleti açılamadı"
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
@@ -8793,7 +8883,7 @@ msgstr "İletiler kopyalanıyor"
 msgid "Filtering new message(s)"
 msgstr "%d ileti alınıyor"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8804,45 +8894,41 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "İptal edildi."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Veri sunulmadı"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8853,58 +8939,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s verisi üzerinde GPG işlemi uygulanamadı: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg çalıştırılamadı: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "gpg çalıştırılamadı."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
@@ -9017,21 +9103,34 @@ msgstr ""
 msgid "parse error"
 msgstr "ayrıştırma hatası"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Sanal dizin e-posta sağlayıcısı"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s yüklenemedi: Bu sistemde modül yükleneme desteklenmiyor."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s yüklenemedi: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklenemedi: Modülde başlangıç kodu bulunamadı"
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "`%s' protokolü için alıcı yok"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonim"
@@ -9179,7 +9278,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -9315,20 +9414,7 @@ msgstr "Makine adı çözümlemesinde hata: Makine bulunamadı"
 msgid "Host lookup failed: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: Bilinmeyen hata"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Sanal dizin e-posta sağlayıcısı"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "diğer bir dizin listesinden alınan iletileri okumak için"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "`%s' protokolü için alıcı yok"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9398,21 +9484,25 @@ msgstr "Sunucu: %s, Tür: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Dizin alınamadı: Gerçersiz"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Çöp"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9643,21 +9733,31 @@ msgstr "Bu isimle bir ileti yok: %s (%s)"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, 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:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "geçici dizin kapatılamadı: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9674,16 +9774,11 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Yeni iletilerin denetlenme aralığı: "
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Adres Defteri:"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9703,44 +9798,42 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Parola"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
 "sağlar."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Öntanımlı"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Kalın sisli"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9749,26 +9842,26 @@ msgstr ""
 "%s@%s IMAP sunucusundan genel uyarı:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Sunucu cevabı çok erken bitti."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
@@ -9783,7 +9876,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
 
@@ -9792,12 +9885,12 @@ msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
 msgid "Scanning for changed messages"
 msgstr "Değiştirilen iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İleti alınamadı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9813,25 +9906,25 @@ msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanılabilir değil"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 
@@ -9891,27 +9984,37 @@ msgstr "İsim alanı"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Yeni iletileri tüm dizinlerde denetle"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Yeni iletileri tüm dizinlerde denetle"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP sunucu %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9920,69 +10023,69 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine bağlantı kurulamadı (%d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "%s sunucusuna bağlantı kurulamadı"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9993,24 +10096,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Dizin içinde yeni satır karakteri bulunamaz."
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ana dizin üzerinde alt dizin açılamaz"
 
@@ -10032,7 +10143,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s üzerindeki POP sunucusuna bağlantı kurulamadı."
@@ -10115,8 +10226,8 @@ 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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10128,55 +10239,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "Yerel disklerde gelen dizini bulunmasın"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyası %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "`%s' dizin özet dosyası silinemedi: %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Özet kaydedilemedi: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "İleti özete eklenemedi: bilinmeyen neden"
 
@@ -10195,53 +10306,44 @@ msgstr "%s dizinine ileti eklenemedi: %s"
 msgid "Invalid message contents"
 msgstr "Geçersiz ileti içeriği"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Dizin açılamadı: `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "%s dizini bulunamadı."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"'%s dizini yaratılamadı:\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' bir maildir dizini."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10264,9 +10366,9 @@ msgid "Checking for new messages"
 msgstr "Yeni iletiler denetleniyor"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
@@ -10311,159 +10413,137 @@ msgstr "Dizin onarılamayacak şekilde bozulmuş."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"`%s' dosyası açılamadı:\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Bu isimde bir dizin yaratılamadı"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"%s dizini yaratılamadı:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "%s dosyası eklenemedi: Normal bir dosya değil."
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"`%s' dosyası yaratılamadı:\n"
+"`%s' dizini silinemedi:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal bir dosya değildir."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"`%s' dizini silinemedi:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' dizini boş değil. Silinmedi."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Bu isimde bir dizin yaratılamadı"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "%s dizini yaratılamadı: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Bu kart numarası var"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Bu dizin adı geçersiz: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Dizin açılamadı: `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yakınında e-posta ayrıştırma hatası (dizin: %s)"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "%s dosyası açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Geçici posta kutusu açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kaynak dizin %s açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "geçici dizin kapatılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Özet ve dizin uyuşmazlığı"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Geçici posta kutusuna yazma hatası: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
@@ -10478,10 +10558,17 @@ msgstr "İleti aktarımı iptal edildi"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "İleti mh dizinine eklenemedi: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"'%s dizini yaratılamadı:\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' bir dizin değil."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "%s dizini alınamadı: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10503,6 +10590,29 @@ msgstr "%s saklama dizini geçersiz"
 msgid "Folder `%s/%s' does not exist."
 msgstr "%s dizini bulunamadı."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Dizin açılamadı: `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "%s dizini bulunamadı."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"'%s dizini yaratılamadı:\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10738,47 +10848,47 @@ msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Bir dizin kendi üzerine taşınamaz."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Bu isimde bir dizin yok: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Grup alınamadı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "İleti alınamadı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komutu başarısız oldu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Yeni iletiler taranıyor"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Bilinmeyen sunucu cevabı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "İşlem başarısız oldu: %s"
@@ -10825,7 +10935,7 @@ msgstr "%s günden sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10912,7 +11022,7 @@ msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10965,7 +11075,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail üzerinden ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11131,7 +11241,7 @@ msgstr "%s üzerinden STMP ileti gönderimi"
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Gönderilen iletiler"
 
@@ -11238,34 +11348,34 @@ msgstr "QUIT isteğinde zaman aşımı: %s"
 msgid "QUIT response error"
 msgstr "QUIT cevap hatası"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "ek"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili dosyaları ekler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Dosya ekle..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "İletiyi bir dosya ekle"
 
@@ -11390,19 +11500,19 @@ msgstr "<bir dizin seçmek için tıklayın>"
 msgid "Attach file(s)"
 msgstr "Bir dosya ekle"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11411,31 +11521,31 @@ msgstr ""
 "%s dosyasını yüklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Dosya var. Üzerine yazılsın mı?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasını kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasını yüklerken hata oldu"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Dosyaya erişirken hata oldu: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11444,7 +11554,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11453,7 +11563,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11462,7 +11572,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11471,7 +11581,7 @@ msgstr ""
 "İletilerin otomatik kaydında hata: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11480,7 +11590,7 @@ msgstr ""
 "Evolution, önceki oturumlardan kaydedilmemiş dosyalar saptadı.\n"
 "Bunları kurtarmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11491,49 +11601,49 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Uyarı: İleti Değiştirildi"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "İmza:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Otomatik"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11545,7 +11655,7 @@ msgstr ""
 "Lütfen sistemde gtkhtml ve libgtkhtml programlarının\n"
 "kurulu olduğunu denetleyin.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11554,7 +11664,7 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11897,7 +12007,7 @@ msgstr "Sonra"
 msgid "You must specify a folder."
 msgstr "Bu dizin adı belirtmelisiniz."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Dizini Seçin"
@@ -11912,19 +12022,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Önemli"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Yapılacaklar"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Sonra"
 
@@ -12006,7 +12116,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Sanal Dizinler"
 
@@ -12022,7 +12132,7 @@ msgstr "önce"
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "saniye"
 
@@ -12198,7 +12308,7 @@ msgstr "İşaretli"
 msgid "Junk Test"
 msgstr "Haziran"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12311,9 +12421,10 @@ msgstr "başlayan"
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Konu"
 
@@ -12322,25 +12433,25 @@ msgstr "Konu"
 msgid "Unset Status"
 msgstr "Durum belirt"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Görevler"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Görev Ekle"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Görev Düzenle"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 #, fuzzy
 msgid "Rule name"
 msgstr "Kural adı:"
@@ -12381,16 +12492,16 @@ msgstr "Konu içerir"
 msgid "Subject does not contain"
 msgstr "Konu içermez"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Bu vfolder adını değiştirmelisiniz."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Kaynak için en az bir dizin belirtmelisiniz."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 #, fuzzy
 msgid "VFolder source"
 msgstr "vFolder Kaynakları"
@@ -12447,9 +12558,9 @@ msgstr "Evolution e-posta dizin görüntüleme bileşeni."
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "İleti"
 
@@ -12457,7 +12568,7 @@ msgstr "İleti"
 msgid "Mail Accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "E-posta Tercihleri"
 
@@ -12495,15 +12606,15 @@ msgstr "Lütfen geçerli bir betik adı veriniz"
 msgid "[script]"
 msgstr "[betik]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Dil(ler)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Betik imzası girin"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
@@ -12588,7 +12699,6 @@ msgid "Unread messages"
 msgstr "Sonraki O_kunmamış İleti"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<bir dizin seçmek için tıklayın>"
 
@@ -12596,391 +12706,409 @@ msgstr "<bir dizin seçmek için tıklayın>"
 msgid "Create New Folder"
 msgstr "Yeni Bir Dizin Yarat"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Dizin _adı:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Gelen"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Dizini seçin"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "%s dizini silinemedi: Böyle bir dizin yok"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Gerçekten \"%s\" dizini silinsin mi?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Sil: \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" dizinini yeniden adlandır:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Dizini yeniden adlandır"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pencerede Aç"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Taşı"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "_Yeni Dizin..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "_Yeniden adlandır"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ö_zellikler..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Temizle"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "_Filtreleri Uygula"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listesine Göre Filtrele"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Öntanımlı"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Görev eklemek için tıklayın"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Eşleşenler:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Görevlendirildi"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 msgid "Valid signature"
 msgstr "Geçerli imza"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 msgid "Invalid signature"
 msgstr "Geçersiz imza"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 msgid "Unencrypted"
 msgstr "Şifrelenmemiş"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 msgid "_View Certificate"
 msgstr "_Sertifikayı Görüntüle"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifika geçersiz"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Zamanı geçen görevler:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "İzle"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "_Gizle"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sayfa: %d / %d"
@@ -13024,29 +13152,34 @@ msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 msgid "Formatting message"
 msgstr "İletiler taşınıyor"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Gönderen"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "E-postalayıcı"
 
@@ -13060,8 +13193,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13079,21 +13212,26 @@ msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Desteklenmeyen şema"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Sertifika imzası açılamadı"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Sertifika imzası açılamadı"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13105,57 +13243,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "'%s' geçiş yapılamadı: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "'%s' geçiş yapılamadı: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "'%s' makinesi bulunamadı: %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Başlıksız İleti"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "_Gönderene cevapla"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "_Bağlantıyı Tarayıcıda Aç"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "İletiyi _listeye gönder..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "Adres Defterine Ek_le"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
@@ -13205,18 +13343,18 @@ msgstr "Filtreler"
 msgid "-------- Forwarded Message --------"
 msgstr "Yönlendirilmiş İleti"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13225,7 +13363,7 @@ msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13234,31 +13372,37 @@ msgstr ""
 "%s isimli bir dosya zaten var.\n"
 "Üzerine yazılsın mı?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "İleti"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 msgid "Add address"
 msgstr "Adres ekle"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "%s'ten E-posta"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Geçici dizin yaratılamadı: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13272,7 +13416,7 @@ msgstr ""
 "\n"
 "Devam etmek istiyor musunuz?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13301,323 +13445,331 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "İletinin öntanımlı konusu."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "İletinin öntanımlı konusu."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Öntanımlı _Yönlendirme biçemi: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "İletinin öntanımlı konusu."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "İletinin öntanımlı konusu."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Öntanımlı _Yönlendirme biçemi: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Dizin çubuğunu göster/gizle"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Dizin çubuğunu göster/gizle"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Programdan çı_karken çöp dizinini sil"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Programdan çı_karken çöp dizinini sil"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Bu iletiyi sonra gönder"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "İ_letiyi her zaman HTML olarak gönder."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "İ_letiyi her zaman HTML olarak gönder."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Canlandırmalı resimleri göster"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Canlandırmalı resimleri göster"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "İletiyi normal biçemde göster"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Önizleme _Panosu"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Y_eni ileti geldiğinde müzik çal"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "İmla _Denetimi"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminal Yazıtipi:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Yazdırmak için HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13625,178 +13777,173 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Konumlandırılan İleti listesi"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Konumlandırılan İleti listesi"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Değişken genişlik:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Aktar"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution e-posta programı."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Evolution e-posta programı."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution e-posta programı."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution, eski Elm iletilerinizi alıyor"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Alınıyor..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Lütfen bekleyiniz"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, fuzzy, c-format
-msgid "Importing %s as %s"
-msgstr ""
-"%s alınıyor.\n"
-"%s başlatılıyor"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "%s taranıyor"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Dosyalar Alınıyor"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13804,16 +13951,44 @@ msgstr ""
 "Evolution, Elm ileti dosyaları buldu.\n"
 "Bunları Evolution'a aktarmak ister misiniz?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Bu dizini sil"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Aktarıcıyı seçin"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Alınıyor"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Dosyalar Alınıyor"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "%s taranıyor"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Öncelik Filtresi \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13828,7 +14003,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13836,7 +14011,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13845,31 +14020,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution, Netscape verilerini alıyor."
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "E-posta filtreleri taranıyor"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Dizin taranıyor"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Aktarma işlemi başlıyor"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution, Netscape verilerini alıyor."
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "E-posta Filtreleri"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13877,11 +14045,20 @@ msgstr ""
 "Evolution, Netscape e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution, Pine'daki tüm verileri alıyor"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Dosyalar Alınıyor"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Adres Defteri"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13889,7 +14066,7 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13932,19 +14109,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Gerekli tüm bilgiler verilmedi."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Yol:"
 
@@ -13993,28 +14170,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 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-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Yeni bir e-posta hazırla"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Yeni VDizin"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "E-posta Filtreleri"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Yeni bir dizin yarat"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "Takvimin gösterecek olduğu URI"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Kimlik"
 
@@ -14058,7 +14250,7 @@ msgstr ""
 "hangi protokolü kullandığınızı bilmiyorsanız sistem yöneticinize, ya da "
 "İnternet servis sağlayıcınıza başvurun."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Hesap Yöneticisi"
 
@@ -14084,122 +14276,117 @@ msgid "Connecting to server..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Desteklenen türleri denetle "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Ş_ifreli e-posta gönderirken kendime de şifrele"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Hesap Düzenleyici"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "_Betik Ekle"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Yeni imza ekle..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "_Her zaman gizli karbon kopyala (Bcc): "
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "_Her zaman karbon kopyala (Cc):"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Şi_frelerken her zaman anahtar listemdeki anahtarlara güven"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
 msgstr "İletiyi bir dosya ekle"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Karakter seti:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Renkler"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Yeni iletilerin denetlenmesi"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "_Yazarken imla denetimi yap"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Yeni iletilerin denetlenmesi"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "_Hatalı yazılan kelimelerin rengi:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "İleti Düzenleme"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14215,285 +14402,281 @@ msgstr ""
 "\n"
 "Ayarlarınızı kaydetmek için \"Uygula\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Ö_ntanımlı"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Öntanımlı Davranış"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Ö_ntanımlı karakter kodlaması:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Silinen Postalar"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Toplantı isteklerini imzalama (Outlook uyumluluğu için)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Tamamlandı"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "_Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "_E-posta adresi:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Programdan çı_karken çöp dizinini sil"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "_Eş aralıklı:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Daha Az Seçenek"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Yazıtipi Özellikleri"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "İ_letileri HTML biçimle"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "_Başlıklar"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "_Cevapları renklendir: "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "Bağlantılı"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Etiketler ve Renkler"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Yüklenen Resimler"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "E-posta Yapılandırması"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Posta Kutusu konumu"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "İleti Düzenleyici"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "İleti Görünümü"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "İleti Yazıtipi"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Not: İlk defa bağlanıncaya kadar size herhangi bir parola sorulmayacaktır."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Seçimlik Bilgi"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Kurum:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Yazdırılan Yazıtipleri"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Quoted"
 msgstr "Not"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "_Cevapla:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Alınan İletiler"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Alma Seçenekleri"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "İstenen Bilgiler"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Öntanımlı Değerlere Geri Dön"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Güvenlik"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Güvenli MIME (SMIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Yazdırma için HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Yazdırmak için HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "İleti Gönderiliyor"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "_Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "S_unucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Su_nucu Türü: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "_Dosya adı belirtin"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "İmla _Denetimi"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14503,7 +14686,7 @@ msgstr ""
 "kullanılacaktır. \"İsim\" başlığı altında\n"
 "girilen kısım sadece görünüm amaçlıdır."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14513,7 +14696,7 @@ msgstr ""
 "belirtmenizi sağlar. Buradaki liste, sözlüğü sistem kurulan dillerin "
 "oluşturduğu listedir."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14521,15 +14704,15 @@ msgstr ""
 "Bu hesaba erişebileceğiniz bir isim verin.\n"
 "Örneğin: \"İş hesabım\" ya da \"Kişisel\" gibi."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "_Değişken genişlik:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14539,173 +14722,173 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_İmza Ekle"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Resimleri her zaman ağdan indir"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Kimlik denetim türü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "_Yeni iletilerin denetlenme aralığı: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Gülme simgelerini otomatik ekle"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Yeni ileti geldiği zaman biple"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Bir dizini silmeden önce onayla"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Ö_ntanımlı imza:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Ön_tanımlılar"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Yeni ileti geldiğinde beni uyarma"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Yö_nlendirme türü:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML İleti"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Kimlik"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Haziran"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "İ_letileri"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "R_esimleri hiç bir zaman ağdan indirme"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Y_eni ileti geldiğinde müzik çal"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "İ_letileri konusuz gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Alınan İletiler"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Cevaplama yöntemi:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Ö_ntanımlı değerlere geri dön"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Betik:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "_Seç..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Gönderilen İ_letiler"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Canlandırmalı resimleri göster"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "İm_zalar"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "_Standart Yazıtipi:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "_Terminal Yazıtipi:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "_Güvenli bağlantı (SSL) kullan:"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "_Diğer uygulamalarla aynı yazıtipini kullan"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "açıklama"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s adresine ping gönderiliyor"
@@ -14728,7 +14911,7 @@ msgstr ""
 "İşlem sırasında hata:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Çalışıyor"
 
@@ -14740,128 +14923,128 @@ msgstr "Dizin filtreleniyor"
 msgid "Fetching Mail"
 msgstr "İleti Alınıyor"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gönderiliyor"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Tamamlandı."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Yönlendirilmiş iletiler"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s numaralı ileti alınıyor"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ileti alınıyor"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ileti kaydediliyor"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14870,7 +15053,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14879,11 +15062,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14892,22 +15075,22 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14939,38 +15122,38 @@ msgstr "Şifreleme"
 msgid "Security Information"
 msgstr "Güvenlik bilgisi"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "İptal ediliyor..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Sunucu: %s, Tür: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Yol: %s, Tür: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Tür: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "İletileri Al ve Gönder"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "Hepsini İptal _Et"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
@@ -15075,20 +15258,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vDizinler"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "VDizin Düzenle"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
@@ -15417,100 +15600,20 @@ msgstr "Çevrimdışı Dizinler"
 msgid "Autocompletion Folders"
 msgstr "Otomatik Tamamlama Dizini"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Dizin kopyalanamadı: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Dizin taşınamadı: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Bir dizin kendi üzerine taşınamaz."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Bir dizin üzerine kopyalanamaz."
-
-#: shell/e-shell-folder-commands.c:204
-#, fuzzy
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Bir dizin kendi üzerine taşınamaz."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "\"%s\" dizinini kopyalamak için bir dizin adı verin:"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Dizini kopyala"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "\"%s\" dizinini taşımak için bir dizin adı verin:"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Dizini taşı"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Dizin silinemedi:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Gerçekten \"%s\" dizini silinsin mi?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Dizin yeniden adlandırılamadı:\n"
+"Belirlenen dizin yaratılamadı:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Bu dizin adı geçersiz: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Seçilen dizin başka bir kullanıcıya ait değil"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Dizin silinemedi:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Belirlenen dizin yaratılamadı:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(isimsiz)"
@@ -15651,7 +15754,7 @@ msgstr "gpg çalıştırılamadı."
 msgid "_Import"
 msgstr "Aktar"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Bağlantılar kesiliyor..."
 
@@ -15689,6 +15792,10 @@ msgstr "Paylaşımlı dizin açılamadı: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Belirlenen paylaşımlı dizin açılamadı."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Aktarma işlemi başlıyor"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15798,123 +15905,6 @@ msgstr "Yapılandırma Veritabanı bulunamadı"
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Yeni Kısayol Grubu Oluştur"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Grup adı:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Kısayol çubuğundan \"%s\" grubunu silmek istiyor musunuz?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Kısayol Grubunu Yeniden İsimlendir"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Seçili kısayol grubunu yeniden isimlendir:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Küçük Simgeler"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Kısayolları küçük simgeler olarak göster"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "_Büyük Simgeler"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Kısayolları büyük simgeler olarak göster"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Grup Ekle..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Yeni bir kısayol grubu yarat"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "B_u Grubu Sil..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Bu kısayol grubunu sil"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "_Bu Grubu Yeniden Adlandır..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Bu kısayol grubunu yeniden isimlendir"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Kısayol Çubuğunu _Gizle"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Kısayol çubuğunu gizle"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Ö_ntanımlı Kısayolları Oluştur"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Öntanımlı Kısayolları Oluştur"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Kısayolu Yeniden İsimlendir"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Seçili kısayolları yeniden isimlendir:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Bu kısayola bağlı dizini aç"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Y_eni Pencerede Aç"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Bu kısayola bağlı dizini yeni pencerede aç"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Bu kısayolu yeniden isimlendir"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "_Sil"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Bu kısayolu kısayol çubuğundan sil"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Kısayolları kaydederken hata oldu."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Kısayollar"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Denetim kutusu"
@@ -15925,11 +15915,6 @@ msgstr "Denetim kutusu"
 msgid "New"
 msgstr "Yeni"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr ""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16210,59 +16195,59 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Aktarıcıyı seçin"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifika No:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "İşlem"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Deyim"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-posta Adresi:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Sertifikanın süresi dolmuş:%s\n"
 "Veren: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "%s İçin Parolayı Girin"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16331,7 +16316,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_Sertifika No:"
@@ -16406,11 +16391,11 @@ msgstr "Bölüm"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16459,237 +16444,237 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifika No:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Bu kart numarası var"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Sertifika reddedildi"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifika Otoritesi Güvenilir Değil"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Genel Anahtar: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Konu: %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Spool dizini işlenemedi"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Geçersiz Sertifika Otoritesi (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Geçersiz Sertifika Otoritesi (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Bilgi Yok"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "ek"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Sertifika imza hatası"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Deyim"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s sunucu %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifika imza hatası"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Ekle"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Konu: %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sertifika imza hatası"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "%s İçin Parolayı Girin"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Sertifika No:"
@@ -17289,7 +17274,8 @@ msgid "_Threaded Message List"
 msgstr "_Konumlandırılan İleti Listesi"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Gö_ndereni Adres Defterine Ekle"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17297,7 +17283,8 @@ msgid "A_pply Filters"
 msgstr "_Filtreleri Uygula"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Göndereni Adres Defterine Ekle"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17759,10 +17746,6 @@ msgstr "Biçi_m"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Aç"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Bir dosya aç"
@@ -18134,22 +18117,6 @@ msgstr "_Gönder / Al"
 msgid "_Window"
 msgstr "_Pencere"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Yazdırma Özeti"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Özeti yazdır"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Tekrar yükle"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Görünümü tekrar yükle"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Ş_irkete Göre"
@@ -18213,8 +18180,8 @@ msgstr "_Kategori İle"
 msgid "_Tasks"
 msgstr "_Görevler"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18460,23 +18427,23 @@ msgstr "_Ara"
 msgid "_Find Now"
 msgstr "Ş_imdi Bul"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Temizle"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "Öğe No"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "Alt öğe no"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Metin"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "Ş_imdi Bul"
 
@@ -18490,6 +18457,209 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandı)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Adres Defteri Kaynakları"
+
+#~ msgid "No data provided"
+#~ msgstr "Veri sunulmadı"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "`%s' dosyası açılamadı:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s dizini yaratılamadı:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "`%s' dosyası yaratılamadı:\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' bir dizin değil."
+
+#, fuzzy
+#~ msgid "Importing %s as %s"
+#~ msgstr ""
+#~ "%s alınıyor.\n"
+#~ "%s başlatılıyor"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "E-posta filtreleri taranıyor"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Dizin taranıyor"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Dizin kopyalanamadı: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Dizin taşınamadı: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Bir dizin kendi üzerine taşınamaz."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Bir dizin üzerine kopyalanamaz."
+
+#, fuzzy
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Bir dizin kendi üzerine taşınamaz."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "\"%s\" dizinini kopyalamak için bir dizin adı verin:"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Dizini kopyala"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "\"%s\" dizinini taşımak için bir dizin adı verin:"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Dizini taşı"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Dizin silinemedi:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Gerçekten \"%s\" dizini silinsin mi?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Dizin yeniden adlandırılamadı:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Seçilen dizin başka bir kullanıcıya ait değil"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Dizin silinemedi:\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Yeni Kısayol Grubu Oluştur"
+
+#~ msgid "Group name:"
+#~ msgstr "Grup adı:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Kısayol çubuğundan \"%s\" grubunu silmek istiyor musunuz?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Kısayol Grubunu Yeniden İsimlendir"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Seçili kısayol grubunu yeniden isimlendir:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Küçük Simgeler"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Kısayolları küçük simgeler olarak göster"
+
+#~ msgid "_Large Icons"
+#~ msgstr "_Büyük Simgeler"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Kısayolları büyük simgeler olarak göster"
+
+#~ msgid "_Add Group..."
+#~ msgstr "_Grup Ekle..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Yeni bir kısayol grubu yarat"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "B_u Grubu Sil..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Bu kısayol grubunu sil"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "_Bu Grubu Yeniden Adlandır..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Bu kısayol grubunu yeniden isimlendir"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Kısayol Çubuğunu _Gizle"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Kısayol çubuğunu gizle"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Ö_ntanımlı Kısayolları Oluştur"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Öntanımlı Kısayolları Oluştur"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "Kısayolu Yeniden İsimlendir"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Seçili kısayolları yeniden isimlendir:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Bu kısayola bağlı dizini aç"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Y_eni Pencerede Aç"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Bu kısayola bağlı dizini yeni pencerede aç"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Bu kısayolu yeniden isimlendir"
+
+#~ msgid "Re_move"
+#~ msgstr "_Sil"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Bu kısayolu kısayol çubuğundan sil"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Kısayolları kaydederken hata oldu."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Kısayollar"
+
+#~ msgid "Print Summary"
+#~ msgstr "Yazdırma Özeti"
+
+#~ msgid "Print summary"
+#~ msgstr "Özeti yazdır"
+
+#~ msgid "Reload"
+#~ msgstr "Tekrar yükle"
+
+#~ msgid "Reload the view"
+#~ msgstr "Görünümü tekrar yükle"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Dizine kopyala..."
 
@@ -18771,21 +18941,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ "kullanılmıyor. Lütfen Evolution kullanıcı dosyalarının\n"
 #~ "kopyalanabilmesi için bu dizini taşıyınız."
 
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolution LDIF alıcısı"
-
-#~ msgid "LDAP Data Interchange Format (.ldif)"
-#~ msgstr "LDAP Veri Aktarım Biçim (.ldif)"
-
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolution VCard Alıcısı"
-
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolution VCard alıcısı"
-
-#~ msgid "VCard (.vcf, .gcrd)"
-#~ msgstr "VCard (.vcf, .gcrd)"
-
 #~ msgid "Primary"
 #~ msgstr "İlk"
 
@@ -26793,9 +26948,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Appointments"
 #~ msgstr "Randevular"
 
-#~ msgid "No appointments."
-#~ msgstr "Randevu yok."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27277,9 +27429,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Moderate mist"
 #~ msgstr "Orta derecede sisli"
 
-#~ msgid "Thick mist"
-#~ msgstr "Kalın sisli"
-
 #, fuzzy
 #~ msgid "Shallow mist"
 #~ msgstr "Challis"
@@ -27892,9 +28041,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Bu dizini içeren yeni bir pencere oluştur"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Bu dizini sil"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Farklı bir dizin göster"
 
diff --git a/po/uk.po b/po/uk.po
index b8f4535c75..c84ba5dfbb 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -51,8 +51,7 @@ msgstr "Налаштовування поштових рахунків"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -99,20 +98,20 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -120,67 +119,67 @@ msgstr "Адресна книга"
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Властивості..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Новий контакт:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Створити новий контакт"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Новий список контактів"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "Новий список контактів"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Створити новий список контактів"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Неможливо з'єднатись з сервером LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "На вдалося пройти автентифікацію на сервері LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "Неможливо виконати запит на Кореневому DSE"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Цей сервер не підтримує схему інформації LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Помилка при отриманні схеми інформації"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "Відповідь сервера не містить підтримуваної схеми інформації"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Очікування..."
@@ -194,42 +193,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Зондування %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Особисте"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Теки автозавершення"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -241,7 +242,7 @@ msgstr ""
 "відобразити. Зробіть ваш запит більш специфічним або підвищить\n"
 "обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -252,19 +253,19 @@ msgstr ""
 "встановлене для цієї книги адрес. Зробіть ваш запит більш \n"
 "специфічним або підвищить обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Механізм цієї книги адрес не спроможний проаналізувати цей запит."
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Механізм цієї книги адрес відмовився виконати цей запит."
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Цей запит не було завершено відповідним чином."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -273,7 +274,7 @@ msgstr ""
 "Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
 "та чи ви маєте потрібні права доступу до нього."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -282,7 +283,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -294,7 +295,7 @@ msgstr ""
 "встановити LDAP з указаного нижче посилання, а потім\n"
 "скомпілювати версію Evolution з CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -303,28 +304,33 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Не вдалося відкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонімний доступ до сервера LDAP"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Неможливо автентифікуватися.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведіть пароль для %s (користувач %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI, який відобразить календар"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, який відобразить календар"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -368,7 +374,7 @@ msgstr " Показати підтримувані бази "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -401,20 +407,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Майстер налаштовування LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Джерело адресної книги"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Джерело адресної книги"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Джерела адресних книг..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Завжди"
 
@@ -425,7 +432,8 @@ msgstr "Анонімно"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -434,55 +442,55 @@ msgstr ""
 "\n"
 "Натисніть \"Завершити\" щоб зберегти вказані параметри."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "З'єднання"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Відокремлене _ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Для автентифікації на сервері Evolution буде використовувати це відокремлене "
 "ім'я"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Для автентифікації на сервері Evolution буде використовувати електрону адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Завершено"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Групове"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Ніколи"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -498,23 +506,23 @@ msgstr ""
 "Спитайте системного адміністратора, чи підтримує ваш сервер LDAP ці "
 "протоколи."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Один рівень"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "Простір по_шуку: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Вибрано:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -524,7 +532,7 @@ msgstr ""
 "LDAP лише, якщо\n"
 "він підтримує SSL або TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -542,7 +550,7 @@ msgstr ""
 "TLS, бо\n"
 "ваше з'єднання вже захищене."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -555,7 +563,7 @@ msgstr ""
 "що ваше з'єднання не буде безпечним, та ви будете уразливі до порушення "
 "безпеки."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -565,44 +573,45 @@ msgstr ""
 "Вибір цього параметру дозволить вам змінити типові параметри Evolution\n"
 "для виконання пошуку в LDAP, створення та виправлення контактів. "
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr ""
 "Вказання відображуваного імені є останнім короком у налаштовуванні сервера "
 "LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Крок 1: Інформація про сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Крок 2: З'єднання з сервером"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Крок 3: Пошук каталогу"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Всі нижчі рівні"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "Підтримувані бази пошуку"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -616,7 +625,7 @@ msgstr ""
 "параметри,\n"
 "зверніться до системного адміністратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -628,7 +637,7 @@ msgstr ""
 "залишите це поле порожнім - пошук виконуватиметься з кореневого елементу "
 "сервера."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -644,12 +653,13 @@ msgstr ""
 "Простір пошуку \"Один рівень\" включає тільки елементи, які знаходяться на "
 "один рівень нижче\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -661,23 +671,24 @@ msgstr ""
 "допомога\n"
 "для отримання цієї інформації."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "Максимальна кількість елементів для завантаження. Встановлення занадто "
 "великого\n"
 "значення сповільнить роботу записної книжки."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -687,7 +698,7 @@ msgstr ""
 "оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого сервера "
 "LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -696,7 +707,7 @@ msgstr ""
 "Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
 "Воно використовується тільки для показу."
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -706,7 +717,7 @@ msgstr ""
 "Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
 "Воно використовується тільки для показу."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -717,28 +728,28 @@ msgstr ""
 "Існує список стандартних портів. Запитайте вашого системного адміністратора\n"
 "який порт слід зазначити."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "Це поле контролює як довго буде тривати пошук."
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "Використовувати _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Використовувати відокремлену назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Використовувати електронну адресу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Усякий раз коли можливо"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -750,19 +761,19 @@ msgstr ""
 "про підключення\n"
 "до нього. Якщо ви не впевнені — зверніться до системного адміністратора."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Назва для відображення:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Межа завантаження:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -771,41 +782,41 @@ msgstr "_Межа завантаження:"
 msgid "_Edit"
 msgstr "_Редагування"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Сп_осіб реєстрації:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Назва _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "За_тримка (в хвилинах):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "картки"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 #, fuzzy
 msgid "general-tab"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 #, fuzzy
 msgid "searching-tab"
 msgstr "Пошук"
@@ -933,7 +944,7 @@ msgstr "Співпраця"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Редактор контактів"
 
@@ -1032,10 +1043,10 @@ msgstr "Категорії..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1087,15 +1098,15 @@ msgid "_Web page address:"
 msgstr "Адреса сторінки WWW:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Адреса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2089,109 +2100,117 @@ msgid "AOL Instant Messenger"
 msgstr "Надіслати повідомлення"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Неназваний список"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Поштове повідомлення"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Послуга готова"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Розташування:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "Ім'я користувача:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Домашня"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Робота"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Інша"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Джерело"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Поля для запису"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Змінено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Назва рахунку"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "Відсутній редактор категорій."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "Цей контакт належить до таких категорій:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Зберегти контакти як VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2199,7 +2218,7 @@ msgstr ""
 "Ви впевнені, що хочете\n"
 "стерти ці контакти?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2207,49 +2226,54 @@ msgstr ""
 "Ви впевнені, що хочете\n"
 " стерти ці контакти?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Робоча"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Порто"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Групове"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не вдалося знайти віджета для поля: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Швидке додавання контакту"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Виправлення повного імені"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Повне ім'я:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr "Ел.пошта"
@@ -2414,11 +2438,11 @@ msgid "Is New List"
 msgstr "Новий список"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Редактор списків контактів"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Зберегти список як VCard"
 
@@ -2509,13 +2533,13 @@ msgid "Email begins with"
 msgstr "Поштова адреса починається з"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорія - "
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Будь-яке поле містить"
 
@@ -2532,101 +2556,101 @@ msgid "Type"
 msgstr "Тип"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Новий контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Новий контактний список..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Імпорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Пошук контактів..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Джерела адресних книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Установки \"Пілота\"..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслати контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Книга адрес..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Книга адрес..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вирізати"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Скопіювати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Поточний вигляд"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2638,8 +2662,8 @@ msgstr ""
 "Щоб використовувати її знову потрібно перезавантажити Evolution"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Будь-яка категорія"
 
@@ -2682,7 +2706,7 @@ msgid "Company Phone"
 msgstr "Телефон компанії"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Ел.пошта"
 
@@ -2744,7 +2768,7 @@ msgid "Nickname"
 msgstr "Прізвисько"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Примітки"
 
@@ -2753,7 +2777,7 @@ msgid "Office"
 msgstr "Офіс"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Організація"
 
@@ -2881,69 +2905,75 @@ msgstr "Вибраний"
 msgid "Has Cursor"
 msgstr "Має курсор"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Члени"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "Ел.пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Робота"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Бостон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Групове"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Автомобільний телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Особисте"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Болонья"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Посада:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Домашній факс"
@@ -2953,8 +2983,8 @@ msgid "Success"
 msgstr "Успішно"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2986,7 +3016,7 @@ msgstr "Протокол не підтримується"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3006,7 +3036,8 @@ msgid "TLS not Available"
 msgstr "TLS недоступна"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Адресна книга не існує"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3148,7 +3179,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "Додати адресу до існуючого контакту \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Запит адресної книги..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3206,18 +3238,41 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "Надрукувати вибрані контакти"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "Надрукувати вибрані контакти"
@@ -3310,7 +3365,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Кількість стовпчиків:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Параметри"
 
@@ -3493,8 +3548,8 @@ msgstr "Не вказано назви файлу."
 msgid "Unnamed List"
 msgstr "Неназваний список"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Ввід пароля"
@@ -3580,10 +3635,9 @@ msgid "Evolution's Tasks component"
 msgstr "Перевірочний компонент Evolutuion."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Завдання"
 
@@ -3628,26 +3682,24 @@ msgstr "Час засипання (в хвилинах)"
 msgid "_Edit appointment"
 msgstr "Ви_правити зустріч"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
 msgstr "Відкрити"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Немає опису."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3656,12 +3708,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Попередження"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3673,7 +3725,7 @@ msgstr ""
 "Замість цього Evolution буде показувати звичайне вікно\n"
 "нагадування."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3690,19 +3742,19 @@ msgstr ""
 "\n"
 "Ви впевнені, що бажаєте виконати цю програму?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "Не запитуйте мене знову про цю програму."
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ініціалізувати Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Не вдалось ініціалізувати gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Не вдалося створити фабрику послуги сповіщення"
 
@@ -3847,24 +3899,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показати номера тижнів у навігаторі дат"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Зведення містить"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Опис містить"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Коментар містить"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Опис містить"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Інше"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3897,7 +3955,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3919,78 +3977,78 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Зустріч"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Засідання"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Створити новий запит на засідання"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова щоденна зустріч"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "_Щоденна зустріч"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Створити нову теку"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4128,7 +4186,7 @@ msgstr "години"
 msgid "minutes"
 msgstr "хвилини"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4202,7 +4260,7 @@ msgid "hour(s)"
 msgstr "годин(а)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "хвилин"
 
@@ -4213,7 +4271,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Увімкнено"
 
@@ -4265,7 +4323,7 @@ msgstr "30 хвилин"
 msgid "60 minutes"
 msgstr "60 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Сповіщення"
 
@@ -4290,7 +4348,7 @@ msgid "Days"
 msgstr "Дні"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "Увімкнути"
 
@@ -4433,7 +4491,7 @@ msgid "_Fri"
 msgstr "Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "Загальне"
 
@@ -4535,7 +4593,7 @@ msgstr ""
 "Натисніть \"Завершити\" щоб зберегти вказані параметри."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Список завдань"
@@ -4713,23 +4771,23 @@ msgstr "%s  Ви не зробили змін, поновити вікно ре�
 msgid "Validation error: %s"
 msgstr "Помилка під час перевірки: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " до "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Виконано "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Виконано "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Обумовлені завдання"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Обумовлені завдання "
 
@@ -4765,8 +4823,8 @@ msgstr "Журнальний запис - %s"
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Зберегти як..."
 
@@ -4798,11 +4856,21 @@ msgstr "Скасувати операцію"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Вибрати теку призначення для імпорту цих даних"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Список завдань"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4911,7 +4979,7 @@ msgstr "Доручити:"
 msgid "Enter Delegate"
 msgstr "Ввести делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Зустріч"
 
@@ -4935,23 +5003,31 @@ msgstr "Планування"
 msgid "Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Неправильна дата початку"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Неправильна дата закінчення"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Неправильний час початку:"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Неправильний час закінчення"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Відказано в доступі при відкриття календарю"
@@ -5032,29 +5108,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Немає"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Потрібен хоча б один учасник."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "Доручити..."
 
@@ -5250,7 +5326,7 @@ msgstr "у"
 msgid "occurrences"
 msgstr "випадки"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Дата й час:"
@@ -5287,7 +5363,7 @@ msgid "_No recurrence"
 msgstr "_Без періодичності"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "Видалити"
 
@@ -5330,7 +5406,7 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "Скасувати зміни"
 
@@ -5355,7 +5431,7 @@ msgstr "Створено інформацію про призначення за
 msgid "The task information has changed. Send an updated version?"
 msgstr "Змінилась інформація про завдання. Надіслати оновлену версію?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Неправильна дата виконання"
 
@@ -5368,7 +5444,7 @@ msgstr "% виконання:"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Завершено"
 
@@ -5381,7 +5457,7 @@ msgstr "Високий"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Виконується"
 
@@ -5400,7 +5476,7 @@ msgstr "Звичайний"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Не розпочато"
 
@@ -5442,16 +5518,16 @@ msgstr "Основні"
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Неправильна дата виконання"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не вдалося відкрити адресну книгу"
@@ -5462,7 +5538,7 @@ msgstr "Кон_фіденційне"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Опис:"
 
@@ -5656,11 +5732,10 @@ msgstr "Дата початку"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Зведення"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "колір"
 
@@ -5686,7 +5761,7 @@ msgstr "Пн"
 msgid "S"
 msgstr "Пд"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Сх"
 
@@ -5721,10 +5796,10 @@ msgstr "Ні"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Невідоме"
@@ -5737,99 +5812,105 @@ msgstr "Періодично"
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "Вставити"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "Відкрити"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "Скопіювати"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "За_планувати зустріч..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Параметри..."
 
@@ -5917,7 +5998,7 @@ msgid "Alarms"
 msgstr "Сповіщення"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Виконано"
 
@@ -5975,26 +6056,26 @@ msgstr "%02i хвилинне поділення"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "пп"
@@ -6177,7 +6258,7 @@ msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Скасувати"
@@ -6634,12 +6715,12 @@ msgstr "Пріоритет:"
 msgid "Web Page:"
 msgstr "Сторінка"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Клацніть щоб додати завдання"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6649,7 +6730,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6657,12 +6738,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Відкривання завдань на %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6671,29 +6752,39 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Завершення завдання..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Стирання вибраних об'єктів"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Викреслення"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Завантаження зображень"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Немає зустрічей."
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Відкрити в %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6813,16 +6904,16 @@ msgstr "Інформація про зайнятість (%s до %s)"
 msgid "iCalendar information"
 msgstr "Інформація iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Введіть пароль для %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6830,7 +6921,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6838,12 +6929,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7032,49 +7123,49 @@ msgstr "Вибраний місяць (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Вибраний рік (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Завдання"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Стан: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Пріоритет: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Відсоток виконання: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорії: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "Надрукувати елемент"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Параметри друку"
 
@@ -7083,39 +7174,39 @@ msgstr "Параметри друку"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7176,21 +7267,21 @@ msgstr "Календарне повідомлення"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr ""
 "Тека загального користування, що містить інформацію про зустрічі та події"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Нагадування!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Календарні події"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7198,7 +7289,7 @@ msgstr ""
 "Evolution знайшов файли  Gnome Calendar.\n"
 "Бажаєте імпортувати їх у Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Календар GNOME"
 
@@ -8860,7 +8951,7 @@ msgstr "Неможливо відкрити повідомлення"
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
@@ -8947,7 +9038,7 @@ msgstr "Копіювання повідомлень"
 msgid "Filtering new message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8958,15 +9049,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "Неможливо проаналізувати запит паролю gpg."
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8975,30 +9066,26 @@ msgstr ""
 "Потрібен пароль, щоб відкрити ключ для \n"
 "користувача: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Відмінено."
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Неможливо відкрити секретний ключ: отримано 3 неправильних пароля."
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочікувана відповідь від GnuPG: %s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "Нема даних"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Неможливо зашифрувати: не визначено жодного отримувачів"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9009,34 +9096,34 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збій GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Неможливо виконати gpg: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Неможливо виконати gpg."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -9045,29 +9132,29 @@ msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Тіло містить"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неможливо отримати повідомлення від редактора"
@@ -9178,22 +9265,35 @@ msgstr "Неможливо декодувати секцію MIME: неправ�
 msgid "parse error"
 msgstr "помилка аналізу"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Постачальник віртуальних папок ел.пошти"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Для читання пошти як запиту до іншого набору тек "
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Неможливо завантажити %s: Ця система не підтримує завантаження модулів."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не вдалося завантажити %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдалося завантажити %s: немає ініціалізації в модулі."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Постачальника протоколу `%s' не знайдено"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Анонім"
@@ -9349,7 +9449,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Неправильна автентифікація від сервера."
 
@@ -9484,20 +9584,7 @@ msgstr "Помилка при пошуку хосту: хост не знайд�
 msgid "Host lookup failed: unknown reason"
 msgstr "Помилка при пошуку хосту: причина невідома"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Постачальник віртуальних папок ел.пошти"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Для читання пошти як запиту до іншого набору тек "
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Постачальника протоколу `%s' не знайдено"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9567,21 +9654,25 @@ msgstr "Сервер: %s, Тип: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося створити теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неможливо стерти теку: %s: неправильна операція"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Смітник"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9814,21 +9905,31 @@ msgstr "Неправильне повідомлення %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неможливо стерти теку: %s: немає такої теки"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неможливо перейменувати теку: %s: неправильна операція"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неможливо перейменувати теку: %s: немає такої теки"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Не вдалося закрити тимчасову теку: %s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Не вдалося закрити тимчасову теку: %s"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9846,16 +9947,11 @@ msgstr ""
 "Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Адресна книга"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9875,42 +9971,40 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Пароль"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Типово"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Сильна мгла"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано розірвав з'єднання: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9919,26 +10013,26 @@ msgstr ""
 "Повідомлення з IMAP серверу %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неочікувана відповідь від сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Відповідь сервера завершилась надто скоро."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Відповідь сервера IMAP не містить інформації про %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неочікувана відповідь OK від сервера IMAP: %s"
@@ -9953,7 +10047,7 @@ msgstr "Не вдалося створити каталог %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Не вдалося завантажити зведення для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Теку було знищено і повторно створено на сервері."
 
@@ -9962,12 +10056,12 @@ msgstr "Теку було знищено і повторно створено н
 msgid "Scanning for changed messages"
 msgstr "Пошук змінених повідомлень."
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Неможливо знайти повідомлення: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9983,25 +10077,25 @@ msgstr ""
 "Неможливо отримати повідомлення: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Цього повідомлення зараз не існує"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "Отримання інформації про нові повідомлення"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "Не вдалося знайти тіла повідомлення у відповіді на FETCH."
 
@@ -10060,27 +10154,37 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Перевіряти нову пошту в усіх теках"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Перевіряти нову пошту в усіх теках"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження пошти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP сервіс для %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10089,65 +10193,65 @@ msgstr "IMAP сервіс для %s на %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Розширення SSL/TLS не підтримується"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Збій при встановленні сеансу SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаного типу автентифікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10158,24 +10262,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Теки \"%s\" не існує"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Ім'я теки \"%s\" не є коректним тому, що містить символ \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невідома батьківська тека: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
@@ -10197,7 +10309,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Не вдалося з'єднатись з POP сервером %s."
@@ -10281,8 +10393,8 @@ msgstr ""
 "Pine або Mutt."
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10294,55 +10406,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "локальне сховище не містить тека Вхідні"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Не вдалося стерти файл зведення теки \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Не вдалося зберегти зведення %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Неможливо додати повідомлення до зведення: причина невідома"
 
@@ -10360,53 +10472,44 @@ msgstr "Неможливо додати повідомлення у теку mai
 msgid "Invalid message contents"
 msgstr "Неправильний вміст повідомлення"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалось відкрити теку \"%s\":\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Теки \"%s\" не існує."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалось створити теку \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" не є каталогом Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не вдалось стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10428,9 +10531,9 @@ msgid "Checking for new messages"
 msgstr "Перевірка нових повідомлень"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Збереження теки"
@@ -10474,159 +10577,137 @@ msgstr "Схоже тека непоправно зіпсована."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збій побудови повідомлення: зіпсовано поштову скриньку?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Не вдалося відкрити файл \"%s\":\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Неможливо створити теку з цією назвою"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Не вдалося створити каталог %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Неможливо долучити файл %s: не звичайний файл"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Не вдалось створити файл \"%s\":\n"
+"Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" не є звичайним файлом."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалось стерти теку \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тека \"%s\" не порожня. Не стерто."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Неможливо створити теку з цією назвою"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Ідентифікатор картки вже існує"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Вказана назва теки не правильна: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не вдалося відкрити теку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальна помилка поштового аналізатора на позиції %ld в теці %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Неможливо перевірити теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не вдалося відкрити файл %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не вдалося відкрити тимчасову поштову скриньку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не вдалося закрити вихідну теку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Зведення і тека не співпадають, навіть після синхронізації"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невідома помилка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Не можливо зберегти теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Помилка запису в тимчасову пошту скриньку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Збій запису в тимчасову поштову скриньку: %s: %s"
@@ -10640,10 +10721,17 @@ msgstr "Відмінено додавання повідомлення у MH"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Неможливо додати повідомлення у теку MH: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Не вдалось створити теку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "\"%s\" не є каталогом."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Не вдалося отримати теку: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10665,6 +10753,29 @@ msgstr "Сховище \"%s\" не є регулярним файлом або �
 msgid "Folder `%s/%s' does not exist."
 msgstr "Теки \"%s/%s\" не існує."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Не вдалось відкрити теку \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Теки \"%s\" не існує."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Не вдалось створити теку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10903,47 +11014,47 @@ msgstr "Не вдалося перейменувати теку \"%s\" на \"%s
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Неможливо перенести теку у її власну підтеку."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Невідома помилка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Теки \"%s\" не існує"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Не вдалося отримати групу: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Не вдалося відіслати повідомлення: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Збій команди NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: пошук нових повідомлень"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Невідома відповідь сервера: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "Використовуйте скасування"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збій операції: %s"
@@ -10990,7 +11101,7 @@ msgstr "Стирати по завершенню %s днів"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11079,7 +11190,7 @@ msgid "No such folder `%s'."
 msgstr "Теки \"%s\" не існує."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11133,7 +11244,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Відправлення пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11300,7 +11411,7 @@ msgstr "Постачання пошти SMTP через %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо відіслати повідомлення: неправильна адреса відправника."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
@@ -11408,34 +11519,34 @@ msgstr "Затримка відповіді на QUIT: %s"
 msgid "QUIT response error"
 msgstr "Помилка відповіді на QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fкб"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fМб"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fГб"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибрані елементи з списку долучень"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Долучити файл до повідомлення"
 
@@ -11557,20 +11668,20 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Attach file(s)"
 msgstr "Долучити файл(и)"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11579,30 +11690,30 @@ msgstr ""
 "Помилка зчитування файлу: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Файл існує, переписати?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка доступу до файлу: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "Неможливо отримати повідомлення від редактора"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11611,7 +11722,7 @@ msgstr ""
 "Неможливо встановити позицію у файлі: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11620,7 +11731,7 @@ msgstr ""
 "Неможливо обрізати файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11629,7 +11740,7 @@ msgstr ""
 "Неможливо скопіювати дескриптор файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11638,7 +11749,7 @@ msgstr ""
 "Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11647,7 +11758,7 @@ msgstr ""
 "Ximian Evolution знайшов незбереженні файли попереднього сеансу.\n"
 "Бажаєте спробувати їх відновити?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11658,43 +11769,43 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Підпис:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Згенеровано автоматично"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Підготувати повідомлення"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11702,7 +11813,7 @@ msgstr ""
 "Не вдалося створити вікно редагування:\n"
 "Неможливо активувати керуючий елемент обрання адреси."
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11714,7 +11825,7 @@ msgstr ""
 "Будь ласка, впевніться що у вас встановлено\n"
 "коректну версію gtkhtml та libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11722,7 +11833,7 @@ msgstr ""
 "Не вдалося створити вікно редактора:\n"
 "Неможливо активувати компонент HTML-редактора."
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12076,7 +12187,7 @@ msgstr "Тоді"
 msgid "You must specify a folder."
 msgstr "Необхідно вказати теку."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Вибір теки"
@@ -12091,19 +12202,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Важливо"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Потрібно зробити"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Пізніше"
 
@@ -12191,7 +12302,7 @@ msgstr ""
 "Дату повідомлення буде порівняно з поточним\n"
 "часом, коли відбулося фільтрування."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Віртуальні теки"
 
@@ -12207,7 +12318,7 @@ msgstr "тому"
 msgid "months"
 msgstr "місяців"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "секунд"
 
@@ -12377,7 +12488,7 @@ msgstr "не відмічено"
 msgid "Junk Test"
 msgstr "Червень"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Позначка"
@@ -12485,9 +12596,10 @@ msgstr "починається на"
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Тема"
 
@@ -12495,25 +12607,25 @@ msgstr "Тема"
 msgid "Unset Status"
 msgstr "Скинути стан:"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Ім'я правили '%s' на є унікальним, виберіть інше."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Правила"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Додати правило"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Змінити правило"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Назва правила"
 
@@ -12553,15 +12665,15 @@ msgstr "Тема містить"
 msgid "Subject does not contain"
 msgstr "Тема не містить"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Віртуальній теці необхідно дати назву."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Ви повинні вказати хоча б одну теку у якості джерела"
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Джерело вірт.папок"
 
@@ -12618,9 +12730,9 @@ msgstr "Компонент відображення поштової теки Ev
 msgid "Evolution Mail preferences control"
 msgstr "Компонент поштового виконавчого зведення Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Пошта"
 
@@ -12628,7 +12740,7 @@ msgstr "Пошта"
 msgid "Mail Accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Вподобання пошти"
 
@@ -12666,15 +12778,15 @@ msgstr "Необхідно вказати правильну назву скри
 msgid "[script]"
 msgstr "[скрипт]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Мова(и)"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Додати цифровий підпис скрипту"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Підписи"
 
@@ -12762,7 +12874,6 @@ msgid "Unread messages"
 msgstr "Наступне непрочитане повідомлення"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<клацніть тут для вибору теки>"
 
@@ -12770,317 +12881,336 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Create New Folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Вкажіть, де створити теку:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Назва теки:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "Вірт.теки"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Неможливо перейменувати теку: %s: неправильна операція"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Не вдалось стерти теку \"%s\": %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Неможливо стерти теку: %s: немає такої теки"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Дійсно видалити теку \"%s\"?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Стерти \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Неможливо перейменувати теку: %s: немає такої теки"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Перейменувати теку \"%s\" на:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Перейменувати теку"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Відкрити у новому вікні"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Перенести"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова тека"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Перейменувати"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Властивості..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Очистити"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливе"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "Віртуальна теку по темі"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "Віртуальна тека відправника"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Фільтр відправника"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Типово"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скопіювати посилання"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клацніть щоб додати завдання"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Відповідності:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Прив'язано"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 "Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
 "складено."
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Редагувати підпис"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Редагувати підпис"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13089,85 +13219,85 @@ msgstr ""
 "Вхідний маркер input_token містить неправильний підпис або підпис який не "
 "може бути перевірено."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Перервано"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Шифрування PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Сертифікат ще не дійсний"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Запізнілі завдання:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Вбудований перегляд"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Прибрати"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Сторінка %d з %d"
@@ -13211,29 +13341,34 @@ msgstr "Вказівник на невідомі зовнішні дані (ти
 msgid "Formatting message"
 msgstr "Перенесення повідомлень"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Від"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Прих.копія:"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "Поштова програма"
 
@@ -13247,8 +13382,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "Дата"
 
@@ -13266,21 +13401,26 @@ msgstr "Неможливо розібрати MIME повідомлення. П�
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Схема не підтримується"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неможливо перевірити підпис листа"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Неможливо перевірити підпис листа"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13292,60 +13432,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Неможливо зберегти %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Неможливо зберегти %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Неможливо створити канал до '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Не вдалось розв'язати назву машини \"%s\": %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Неназване повідомлення"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Відкрити посилання у переглядачі веб"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Відіслати повідомлення у список..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
@@ -13395,18 +13535,18 @@ msgstr "Фільтри"
 msgid "-------- Forwarded Message --------"
 msgstr "Переслане повідомлення"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13415,7 +13555,7 @@ msgstr ""
 "Неможливо записати в \"%s\"\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13424,32 +13564,38 @@ msgstr ""
 "\"%s\" вже існує\n"
 "Хочете переписати?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Повідомлення"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "Файл '%s' не існує або не є звичайним файлом."
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Адреса"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Пошта від %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13462,7 +13608,7 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13490,321 +13636,329 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Початкова тема повідомлення."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Початкова тема повідомлення."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Шукати у тексті відображеного повідомлення"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Шукати у тексті відображеного повідомлення"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Стиль пересилання:"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Початкова тема повідомлення."
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Початкова тема повідомлення."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Стиль відповіді:"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Перемикнути стан показу панелі тек"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Перемикнути стан показу панелі тек"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Виконати дії"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
 "прихованої копії"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Надіслати ел.пошту у HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Надіслати ел.пошту у HTML?"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "Показувати анімовані малюнки"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Показувати анімовані малюнки"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Показати повідомлення у звичайному стилі"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Панель _перегляду"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "Відтворити звуковий файл при отриманні нової пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Перевірка правопису"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Оригінальний контакт:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Вибрати для друку шрифт HTML змінної ширини"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13812,176 +13966,173 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Розбитий на гілки список повідомлень"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Зробити це моїм типовим рахунком"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Змінної ширини:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Імпорт"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Elm importer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution імпортує вашу пошту з Elm"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Імпортування..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Будь ласка, зачекайте"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Імпортування %s як %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Сканування %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Імпортування файлів"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13989,16 +14140,44 @@ msgstr ""
 "Evolution знайшов поштові файли Elm\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Стерти цю теку"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Імпортування"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Імпортування файлів"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканування %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Фільтр пріоритетів \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14024,7 +14203,7 @@ msgstr ""
 "замість пріоритетів. Перевірте важливі фільтри та впевніться,\n"
 "що все працює як планувалося."
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14036,7 +14215,7 @@ msgstr ""
 "які не підтримуються Evolution.\n"
 "Ці функції буде проігноровано."
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14050,31 +14229,24 @@ msgstr ""
 "буде перетворено для перевірки присутності або відсутності\n"
 "рядка в тілі повідомлення."
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Сканування поштових фільтрів"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Сканування каталогу"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Початок імпортування"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Параметри"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Поштові фільтри"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14082,11 +14254,20 @@ msgstr ""
 "Evolution знайшов поштові файли Netscape.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution імпортує ваші старі дані Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Імпортування файлів"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Адресна книга"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14094,7 +14275,7 @@ msgstr ""
 "Evolution знайшов поштові файли Pine.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14137,19 +14318,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Ви ще не ввели потрібну інформацію."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Редактор облікових рахунків Evolution"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Ім'я користувача:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Шлях:"
 
@@ -14201,28 +14382,43 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ви скинули повідомлення, бажаєте вийти все одно?"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Поштове повідомлення"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Створити нове поштове повідомлення"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Нова віртуальна тека"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Поштові фільтри"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Створити нову теку"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, який відобразить календар"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Назва"
 
@@ -14265,7 +14461,7 @@ msgstr ""
 "впевнені, спитайте вашого системного адміністратора або постачальника "
 "Інтернет."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Керування рахунками"
 
@@ -14291,121 +14487,116 @@ msgid "Connecting to server..."
 msgstr "З'єднання з сервером..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "Перевірка типів, що підтримуються"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Завжди шифрувати моїм ключем при надсиланні повідомлень"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Редактор облікових рахунків"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Інформація про рахунок"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Додати скрипт"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Додати новий підпис"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Завжди шифрувати моїм ключем при надсиланні повідомлень"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Завжди надсилати приховану копію (Bcc) до:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Завжди надсилати копію (Сс) до:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Завжди довіряти ключам в моєму сховищі ключів при декодуванні"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Долучити оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Долучення"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Автентифікація"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Набір символів:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Кольори"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Перевірка нової пошти"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Перевіряти правопис під час набору повідомлення"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Перевірка нової пошти"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Колір для слів з помилками"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Компонування повідомлень"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14421,289 +14612,285 @@ msgstr ""
 "\n"
 "Щоб зберегти інформацію натисніть \"Завершити\"."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Типова поведінка"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "Типове кодування символів: "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Видалення пошти"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Не цитувати оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Не підписувати запрошення на засідання (для сумісності з Outlook "
 "compatibility)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Виконано"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Тека _чернеток:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Асистент з Облікових рахунків Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Фіксованої ширини:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "Фільтри"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Властивості шрифту"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Форматувати повідомлення в HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Верхній колонтитул"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Висвітлювати цитування за допомогою"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "В тілі"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Позначки і кольори"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Завантаження зображень"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Конфігурація пошти"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Розміщення поштової скриньки"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Редактор повідомлень"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Відображення повідомлень"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Повідомлення містить"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Зауважте: вас не буде запитано про пароль до моменту першого сеансу зв'язку "
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Необов'язкова інформація"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Ор_ганізація:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
 "прихованої копії"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Шрифти для друкування"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Цитувати оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Процитовано"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "Відповідати до:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Параметри отримання"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Необхідна інформація"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Безпечний MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Вибрати шрифт HTML фіксованої ширини"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Вибрати для друкування шрифт HTML фіксованої ширини"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Вибрати шрифт HTML змінної ширини"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Вибрати для друку шрифт HTML змінної ширини"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Тека надісланих повідомлень:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Надіслані повідомлення та чернетки"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автентифікації"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Конфігурація сервера"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Не знайдено конфігураційної бази даних"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Зазначте ім'я файлу:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "Перевірка правопису"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14713,7 +14900,7 @@ msgstr ""
 "цифрового підпису. Зазначене вами ім'я буде використане\n"
 "тільки для відображення."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14722,7 +14909,7 @@ msgstr ""
 "Ця сторінка допомагає налаштувати параметри перевірки правопису та мови. "
 "Список мов відображує тільки ті мови, для яких встановлено словники."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14730,15 +14917,15 @@ msgstr ""
 "Введіть ім'я з яким ви бажаєте посилатися на цей рахунок.\n"
 "Наприклад: \"Робота\" або \"Особисте\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Змінної ширини:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14748,178 +14935,178 @@ msgstr ""
 "\n"
 "Натисніть \"Далі\" для продовження"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "_Додати підпис"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Завжди завантажувати зображення"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "Тип автентифікації: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "Тип автентифікації: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "Автоматично вставляти картинки з смайликами"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "Звуковий сигнал для нової пошти"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "Підтвердження при викреслені теки"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "Типовий підпис:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Не сповіщувати про нову пошту"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Стиль пересилання:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "Повне ім'я:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "В HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "Назва"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Червень"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Зробити це моїм типовим рахунком"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Позначати повідомлення як \"Прочитані\" через"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Ніколи не завантажувати зображення"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "Відтворити звуковий файл при отриманні нової пошти"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Попереджувати при надсиланні повідомлень з порожньою темою"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Стиль відповіді:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Стерти..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "Показувати анімовані малюнки"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Підписи"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Оригінальний контакт:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Використовувати безпечне з'єднання (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Зондування %s"
@@ -14942,7 +15129,7 @@ msgstr ""
 "Помилка під час здійснення операції:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Робота"
 
@@ -14954,128 +15141,128 @@ msgstr "Фільтрування теки"
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Відсилання \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Відсилання повідомлення %d з %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Виконано."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Відкриття сховища %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Імпортування %s як %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Локальні теки"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15084,7 +15271,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15093,11 +15280,11 @@ msgstr ""
 "Помилка при збереженні до: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15106,22 +15293,22 @@ msgstr ""
 "Неможливо створити файл виводу: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15156,39 +15343,39 @@ msgstr "Винятки"
 msgid "Security Information"
 msgstr "Інформація про рахунок"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Скасування..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сервер: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Шлях: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Відіслати й отримати пошту"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Скасувати все"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Очікування..."
 
@@ -15297,20 +15484,20 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба редагувати неіснуючої вірт.теки '%s'"
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
@@ -15646,99 +15833,20 @@ msgstr "Оффлайн-теки"
 msgid "Autocompletion Folders"
 msgstr "Теки автозавершення"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Неможливо скопіювати теку: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Неможливо перейменувати теку: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Неможливо перенести теку в себе."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Неможливо скопіювати теку в себе."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Неможливо перенести теку у її власну підтеку."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Вкажіть теку, в яку буде скопійовано теку \"%s\":"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Скопіювати теку"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Вкажіть теку, в яку буде перенесено теку \"%s\":"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Перенести теку"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Не вдалось стерти теку:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Дійсно видалити теку \"%s\"?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Неможливо змінити назву теки:\n"
+"Неможливо створити вказану теку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Вказана назва теки не правильна: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Вибрана теку не належить іншому користувачеві"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Неможливо видалити теку:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Неможливо створити вказану теку:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Без імені)"
@@ -15878,7 +15986,7 @@ msgstr "Неможливо виконати gpg."
 msgid "_Import"
 msgstr "Імпорт"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Закриття з'єднань..."
 
@@ -15916,6 +16024,10 @@ msgstr "Не вдалося відкрити загальну теку: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Неможливо знайти зазначену загальну теку."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Початок імпортування"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -16025,126 +16137,6 @@ msgstr "Не знайдено конфігураційної бази даних
 msgid "Generic error"
 msgstr "Загальна помилка"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Створити нову групу ярликів"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Назва групи:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Ви справді бажаєте видалити групу \"%s\" з панелі ярликів?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Перейменувати групу ярликів"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Перейменувати вибрану групу ярликів на:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "Малі піктограми"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Показувати ярлики як малі піктограми"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Великі піктограми"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Показувати ярлики як великі піктограми"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "Нова група..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Створити нову групу ярликів"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Видалити цю групу..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Видалити цю групу ярликів"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Перейменувати цю групу..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Перейменувати цю групу ярликів"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Прибрати панель ярликів"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Прибрати панель ярликів"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Створити _типовий ярлик"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Створити типовий ярлик"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Перейменувати ярлик"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Перейменувати вибраний ярлик на:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Відкрити теку, що зв'язана з цим ярликом"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Відкрити у новому вікні"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Відкрити теку, що зв'язана з цим ярликом, у новому вікні"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Перейменувати цей ярлик"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Видалити"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Видалити цей ярлик з панелі ярликів"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Помилка збереження ярликів."
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Ярлики"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -16155,11 +16147,6 @@ msgstr ""
 msgid "New"
 msgstr "Новий"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" у \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16465,59 +16452,59 @@ msgstr ""
 "%s: --online та --offline не можуть бути використані разом.\n"
 "  Use %s --help для більш докладної інформації.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Виберіть імпортер"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Поступ"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Вираз"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Електронна адреса:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Строк дії сертифікату вийшов: %s\n"
 "Подавець: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Введіть пароль для %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16586,7 +16573,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "Ідентифікатор сертифіката:"
@@ -16661,11 +16648,11 @@ msgstr "Організаційна одиниця"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16714,237 +16701,237 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Ідентифікатор картки вже існує"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Питання"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "Пн"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "Гаразд"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "Пн"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Сертифікат не має довіри"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "Iдентиф"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Тема - %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Не вдалося обробити буферну теку"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Неправильне повноваження сертифіката (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Неправильне повноваження сертифіката (CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Параметри"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Немає інформації"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "долучення"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Хорватія"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "Півн. Кароліна"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Вираз"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s на %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Помилка підпису сертифікату"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "Вставити"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Тема - %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Помилка підпису сертифікату"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Введіть пароль для %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "Ідентифікатор сертифіката:"
@@ -17552,7 +17539,8 @@ msgid "_Threaded Message List"
 msgstr "Розбитий на гілки список повідомлень"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Додати відправника в адресну книгу"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17560,7 +17548,8 @@ msgid "A_pply Filters"
 msgstr "Застосувати фільтри"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Додати відправника в адресну книгу"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -18016,10 +18005,6 @@ msgstr "Формат"
 msgid "HT_ML"
 msgstr "_HTML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Відкрити"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Відкрити файл"
@@ -18391,22 +18376,6 @@ msgstr "Відіслати / отримати"
 msgid "_Window"
 msgstr "З_найти зараз"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Надрукувати зведення"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Надрукувати зведення"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Перезавантажити"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Перезавантажити вигляд"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "За компанією"
@@ -18472,8 +18441,8 @@ msgstr "З категорією"
 msgid "_Tasks"
 msgstr "_Завдання"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18722,23 +18691,23 @@ msgstr "Пошук"
 msgid "_Find Now"
 msgstr "З_найти зараз"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "О_чистити"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID елементу"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID піделементу"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Тест"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Знайти зараз"
@@ -18753,6 +18722,211 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% виконано)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Джерело адресної книги"
+
+#~ msgid "No data provided"
+#~ msgstr "Нема даних"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалося відкрити файл \"%s\":\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалося створити каталог %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалось створити файл \"%s\":\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "\"%s\" не є каталогом."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Імпортування %s як %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Сканування поштових фільтрів"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Сканування каталогу"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Неможливо скопіювати теку: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Неможливо перейменувати теку: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Неможливо перенести теку в себе."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Неможливо скопіювати теку в себе."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Неможливо перенести теку у її власну підтеку."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Вкажіть теку, в яку буде скопійовано теку \"%s\":"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Скопіювати теку"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Вкажіть теку, в яку буде перенесено теку \"%s\":"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Перенести теку"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалось стерти теку:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Дійсно видалити теку \"%s\"?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неможливо змінити назву теки:\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Вибрана теку не належить іншому користувачеві"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неможливо видалити теку:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Створити нову групу ярликів"
+
+#~ msgid "Group name:"
+#~ msgstr "Назва групи:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Ви справді бажаєте видалити групу \"%s\" з панелі ярликів?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Перейменувати групу ярликів"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Перейменувати вибрану групу ярликів на:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "Малі піктограми"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Показувати ярлики як малі піктограми"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Великі піктограми"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Показувати ярлики як великі піктограми"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "Нова група..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Створити нову групу ярликів"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Видалити цю групу..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Видалити цю групу ярликів"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Перейменувати цю групу..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Перейменувати цю групу ярликів"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Прибрати панель ярликів"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Прибрати панель ярликів"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Створити _типовий ярлик"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Створити типовий ярлик"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Перейменувати ярлик"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Перейменувати вибраний ярлик на:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Відкрити теку, що зв'язана з цим ярликом"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Відкрити у новому вікні"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Відкрити теку, що зв'язана з цим ярликом, у новому вікні"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Перейменувати цей ярлик"
+
+#~ msgid "Re_move"
+#~ msgstr "Видалити"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Видалити цей ярлик з панелі ярликів"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Помилка збереження ярликів."
+
+#~ msgid "Shortcuts"
+#~ msgstr "Ярлики"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" у \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "Надрукувати зведення"
+
+#~ msgid "Print summary"
+#~ msgstr "Надрукувати зведення"
+
+#~ msgid "Reload"
+#~ msgstr "Перезавантажити"
+
+#~ msgid "Reload the view"
+#~ msgstr "Перезавантажити вигляд"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Скопіювати в теку..."
 
@@ -19385,21 +19559,9 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Інша адреса"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Редактор пошти Evolutuion."
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Редактор пошти Evolutuion."
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Редактор пошти Evolutuion."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Редактор пошти Evolutuion."
-
 #~ msgid "Searching..."
 #~ msgstr "Пошук..."
 
@@ -22261,9 +22423,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Appointments"
 #~ msgstr "Зустрічі"
 
-#~ msgid "No appointments."
-#~ msgstr "Немає зустрічей."
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -22765,9 +22924,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Moderate mist"
 #~ msgstr "Помірна димка"
 
-#~ msgid "Thick mist"
-#~ msgstr "Сильна мгла"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Поверхнева димка"
 
@@ -23188,9 +23344,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Показати теку в новому вікні"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Стерти цю теку"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Відобразити іншу теку"
 
diff --git a/po/vi.po b/po/vi.po
index afa761aa54..93b0ebfe69 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -49,8 +49,7 @@ msgstr "Cấu hình tài khoản thư ở đây"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "Liên lạc"
 
@@ -98,20 +97,20 @@ msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -119,67 +118,67 @@ msgstr "Sổ địa chỉ"
 msgid "Delete"
 msgstr "Xoá"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "Liên lạc mới:"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "_Liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Tạo liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Tạo danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Lỗi kết nối tới LDAP server."
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Lỗi xác thực với LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 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:774
+#: addressbook/gui/component/addressbook-config.c:777
 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:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 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:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "Lỗi nhận thông tin schema"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "Đang chờ..."
@@ -193,42 +192,44 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Đang \"ping\" %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Cá nhân"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Thư mục tự động hoàn chỉnh"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -240,7 +241,7 @@ msgstr ""
 "xác hơn hoặc tăng giới hạn kết quả trong Thông số server thư\n"
 "mục cho sổ địa chỉ này."
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -251,19 +252,19 @@ msgstr ""
 "do bạn cấu hình cho sổ địa chỉ này. Vui lòng tìm kiếm chính xác hơn hoặc\n"
 "tăng giới hạn thời gian trong thông số server thư mục cho sổ địa chỉ này."
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 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/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 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/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "Truy vấn không hoàn tất."
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -272,7 +273,7 @@ msgstr ""
 "Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại đường dẫn có tồn tại\n"
 "hay không và bạn có quyền truy cập vào đường dẫn đó hay không."
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -282,7 +283,7 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do LDAP server \n"
 "không hoạt động."
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -294,7 +295,7 @@ msgstr ""
 "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/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -304,28 +305,33 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do server không\n"
 "hoạt động."
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "Không thể mở sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới LDAP server"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "Lỗi xác thực.\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, 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.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI mà lịch sẽ hiển thị"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI mà lịch sẽ hiển thị"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -369,7 +375,7 @@ msgstr "  _Hiện cơ sở được hỗ trợ "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -402,20 +408,21 @@ msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "Phụ tá cấu hình LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "Nguồn sổ địa chỉ"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "Nguồn sổ địa chỉ"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "Nguồn sổ địa chỉ..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Luôn luôn"
 
@@ -426,7 +433,8 @@ msgstr "Vô danh"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -435,52 +443,52 @@ msgstr ""
 "\n"
 "Vui lòng nhấn nút \"Hoàn tất\" để lưu thiết lập bạn đã nhập ở đây."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "Tên _phân biệt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 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:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 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:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Hoàn tất"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Chung"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "Nhóm"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -494,23 +502,23 @@ msgstr ""
 "server dùng để mã hóa để bảo vệ kết nối của bạn. Hãy hỏi quản trị hệ thống\n"
 "xem LDAP server của bạn có dùng những giao thức này hay không."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Một"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "_Phạm vị tìm: "
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "Đang tìm"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "Đã chọn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -519,7 +527,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:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -534,7 +542,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:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -545,7 +553,7 @@ 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:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -555,42 +563,43 @@ msgstr ""
 "Chọn tùy chọn này sẽ cho phép bạn thay đổi thiết lập mặc định của Evolution\n"
 "cho tìm kiếm LDAP, cũng như tạo và sửa các liên lạc."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr "Xác định tên hiển thị là bước cuối cùng để cấu hình LDAP server."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "Bước 1: Thông tin server"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "Bước 2: Kết nối tới server"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "Bước 3: Tìm thư mục"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "Con"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 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:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -602,7 +611,7 @@ msgstr ""
 "kiếm, và một lần tìm kiếm mất bao lâu. Hãy hỏi quản trị hệ thống của bạn\n"
 "nếu bạn cần thay đổi những tùy chọn này."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -612,7 +621,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:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -627,12 +636,13 @@ msgstr ""
 "mục\n"
 "nằm trong cơ sở tìm.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -643,20 +653,21 @@ msgstr ""
 "đó. 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."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"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:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -665,7 +676,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:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -675,7 +686,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:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -686,7 +697,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:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -697,28 +708,28 @@ 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:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 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:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "_Dùng SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "Dùng tên phân biệt (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Bất cứ khi nào có thể"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -731,19 +742,19 @@ msgstr ""
 "tin đăng nhập của bạn. Vui lòng hỏi quản trị hệ thống của bạn nếu bạn không\n"
 "chắc về những thông tin này."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "Tên _hiển thị:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -752,39 +763,39 @@ msgstr "_Ngưỡng tải về:"
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "Cách đăng _nhập:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "_Số hiệu cổng:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "Tên Ser_ver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "Thời _hạn (phút):"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -913,7 +924,7 @@ msgstr "Hợp tác"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
@@ -1012,10 +1023,10 @@ msgstr "_Phân loại.."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1067,15 +1078,15 @@ msgid "_Web page address:"
 msgstr "Địa chỉ _Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "Địa chỉ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2067,163 +2078,176 @@ msgid "AOL Instant Messenger"
 msgstr "_Gửi thông điệp"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "Danh sách vô danh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Thông điệp thư"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "Dịch vụ sẵn sàng"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "Địa điểm:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: 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-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "Nhà"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Công việc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "Khác"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "Nguồn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Liên lạc"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Liên lạc mới"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "Trường có thể ghi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "Đã thay đổi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "Tên tài khoản"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 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:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 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:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "Lưu liên lạc bằng VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 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/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 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.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "Kinh doanh"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Nhóm"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, 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-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Thêm nhanh liên lạc"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "Sửa toàn bộ"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Họ và tên:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr ""
@@ -2389,11 +2413,11 @@ msgid "Is New List"
 msgstr "Là danh sách mới"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "Bộ hiệu chỉnh danh sách liên lạc"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "Lưu danh sách bằng VCard"
 
@@ -2484,13 +2508,13 @@ msgid "Email begins with"
 msgstr "Thư bắt đầu bằng"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bất kỳ trường nào chứa"
 
@@ -2507,101 +2531,101 @@ msgid "Type"
 msgstr "Kiểu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lưu là VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "Liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "Danh sách liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "Đi tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "Nhập..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "Tìm liên lạc..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Nguồn sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Thiết lập pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Chuyển tiếp liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "In"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "In phong bì"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cắt"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "Sao chép"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2613,8 +2637,8 @@ 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:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
 
@@ -2657,7 +2681,7 @@ 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:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
@@ -2719,7 +2743,7 @@ msgid "Nickname"
 msgstr "Tên hiệu"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -2728,7 +2752,7 @@ msgid "Office"
 msgstr "Văn phòng"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -2856,68 +2880,74 @@ msgstr "Đã chọn"
 msgid "Has Cursor"
 msgstr "Có con trỏ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "Thành viên"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "Công việc"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "Nhóm"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "Cá nhân"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, fuzzy
 msgid "Job Title"
 msgstr "Tên n_ghề:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "Fax ở Nhà"
@@ -2927,8 +2957,8 @@ msgid "Success"
 msgstr "Thành công"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2960,7 +2990,7 @@ msgstr "Chưa hỗ trợ giao thức này"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2980,7 +3010,8 @@ msgid "TLS not Available"
 msgstr "Không có TLS"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "Sổ địa chỉ không tồn tại"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3122,7 +3153,8 @@ 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:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "Đang truy vấn sổ địa chỉ..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3181,18 +3213,41 @@ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Trợ tá bộ nhập Evolution"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "In liên lạc được chọn"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "In liên lạc được chọn"
@@ -3285,7 +3340,7 @@ msgstr "Biên"
 msgid "Number of columns:"
 msgstr "Số cột:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Tùy chọn"
 
@@ -3468,8 +3523,8 @@ msgstr "Chưa có tên tập tin."
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "Nhập mật khẩu"
@@ -3556,10 +3611,9 @@ 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "Công việc"
 
@@ -3604,26 +3658,24 @@ msgstr "Thời gian ngủ (phút)"
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Mở"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Mở"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3632,12 +3684,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3649,7 +3701,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:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3666,19 +3718,19 @@ 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:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "Không thể khởi động gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "Không thể tạo factory Dịch vụ thông báo"
 
@@ -3824,24 +3876,30 @@ msgstr ""
 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:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Tóm tắt chứa"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Mô tả chứa"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Ghi chú chứa"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Mô tả chứa"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "Không khớp"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Lịch"
 
@@ -3874,7 +3932,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3896,78 +3954,78 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, 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:615
+#: calendar/gui/calendar-component.c:857
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Cuộc hẹn n_guyên ngày"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, fuzzy
 msgid "New calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Lịch:"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Tạo thư mục mới"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4105,7 +4163,7 @@ msgstr "giờ"
 msgid "minutes"
 msgstr "phút"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4179,7 +4237,7 @@ msgid "hour(s)"
 msgstr "giờ"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "phút"
 
@@ -4190,7 +4248,7 @@ msgstr "bắt đầu cuộc hẹ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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "Bật"
 
@@ -4242,7 +4300,7 @@ msgstr "30 phút"
 msgid "60 minutes"
 msgstr "60 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "Báo động"
 
@@ -4267,7 +4325,7 @@ msgid "Days"
 msgstr "Ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Bật"
 
@@ -4410,7 +4468,7 @@ msgid "_Fri"
 msgstr "_Sáu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Chung"
 
@@ -4512,7 +4570,7 @@ msgstr ""
 "Vui lòng nhấn nút \"Hoàn tất\" để lưu thiết lập bạn đã nhập ở đây."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Danh sách công việc"
@@ -4686,23 +4744,23 @@ msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " tới "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "Đến hạn "
 
@@ -4738,8 +4796,8 @@ msgstr "Mục nhật ký - %s"
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Lưu là..."
 
@@ -4770,11 +4828,21 @@ msgstr "Hủy tác vụ"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
 
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "Lịch"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "Danh sách công việc"
+
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4885,7 +4953,7 @@ 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:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
@@ -4909,23 +4977,31 @@ msgstr "Lập lịch biểu"
 msgid "Meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Ngày bắt đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Ngày kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Thời điểm đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Thời điểm kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Không đủ quyền truy cập để mở lịch"
@@ -5006,29 +5082,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Không"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 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:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
@@ -5226,7 +5302,7 @@ msgstr "lúc"
 msgid "occurrences"
 msgstr "lần"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "Ngày/Giờ:"
@@ -5263,7 +5339,7 @@ msgid "_No recurrence"
 msgstr "_Không truy hồi"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
@@ -5306,7 +5382,7 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi không?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Hủy thay đổi"
 
@@ -5331,7 +5407,7 @@ msgstr "Thông tin công việc đã được tạo. Gửi nó đi chứ?"
 msgid "The task information has changed. Send an updated version?"
 msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Ngày hoàn thành sai"
 
@@ -5344,7 +5420,7 @@ msgstr "% hoàn tất"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "Hoàn thành"
 
@@ -5357,7 +5433,7 @@ msgstr "Cao"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "Đang làm"
 
@@ -5376,7 +5452,7 @@ msgstr "Bình thường"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
@@ -5418,16 +5494,16 @@ msgstr "Cơ bản"
 msgid "Assignment"
 msgstr "Phân công"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Ngày đến hạn sai"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Không thể mở sổ địa chỉ"
@@ -5438,7 +5514,7 @@ msgstr "Tin tưởn_g"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Mô tả"
 
@@ -5632,11 +5708,10 @@ msgstr "Ngày bắt đầu"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Tóm tắt"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "màu"
 
@@ -5662,7 +5737,7 @@ msgstr "B"
 msgid "S"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Đ"
 
@@ -5697,10 +5772,10 @@ msgstr "Không"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Lạ"
@@ -5713,99 +5788,105 @@ msgstr "Đệ quy"
 msgid "Assigned"
 msgstr "Đã gán"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Đang cập nhật đối tượng"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_In..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Dán"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Công bố thông tin bận/rảnh"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Mở"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Lư_u là..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "T_hiết lập..."
 
@@ -5893,7 +5974,7 @@ msgid "Alarms"
 msgstr "Báo động"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Hoàn tất"
 
@@ -5951,26 +6032,26 @@ msgstr "lệch %02i phút"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
@@ -6152,7 +6233,7 @@ msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
@@ -6613,12 +6694,12 @@ msgstr "Độ ư_u tiên:"
 msgid "Web Page:"
 msgstr "Trang"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Nhấn để thêm công việc"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6628,7 +6709,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6636,12 +6717,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6650,29 +6731,39 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Đang nạp ảnh"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất công việc..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Đang nạp ảnh"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Không có cuộc hẹn"
+
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Mở bằng %s..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6792,16 +6883,16 @@ msgstr "Thông tin rảnh/bận (%s tới %s)"
 msgid "iCalendar information"
 msgstr "Thông tin iCalendar"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6809,7 +6900,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6817,12 +6908,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -7011,49 +7102,49 @@ msgstr "Tháng được chọn (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Năm được chọn (%Y)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "Công việc"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "Trạng thái: %s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "Độ ưu tiên: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phần trăm hoàn thành: %i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "Phân loại: %s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "Liên lạc: "
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "In một mục"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
@@ -7062,39 +7153,39 @@ msgstr "Thiết lập in"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -7155,20 +7246,20 @@ msgstr "Thông điệp lịch"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Thư mục công cộng chứa các cuộc hẹn và sự kiện"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Bộ nhắc nhở!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Sự kiện lịch"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7176,7 +7267,7 @@ msgstr ""
 "Evolution tìm thấy các tập tin Lịch Gnome.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Lịch Gnome"
 
@@ -8838,7 +8929,7 @@ msgstr "Không thể mở thông điệp"
 msgid "Failed on message %d"
 msgstr "Lỗi trên thông điệp %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
@@ -8924,7 +9015,7 @@ msgstr "Đang chép thông điệp"
 msgid "Filtering new message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8935,15 +9026,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 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:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8952,30 +9043,26 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%s\""
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, 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:814
-msgid "No data provided"
-msgstr "Chưa cung cấp dữ liệu"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 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:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8986,61 +9073,61 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG gặp lỗi %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Lỗi thực hiện GPG: %s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "Lỗi thực hiện GPG."
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 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:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, 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:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, 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:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Nội dung phần thân index"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
@@ -9151,21 +9238,34 @@ msgstr "Lỗi giải mã phần MIME: cấu trúc sai"
 msgid "parse error"
 msgstr "lỗi phân tích"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "Bộ cung cấp thư mục ảo"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "Để đọc mail như là một truy vấn của một tập các thư mục khác"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Không thể nạp %s: Hệ thống này chưa hỗ trợ tính năng nạp mô đun."
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Không thể nạp %s: %s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Không thể nạp %s: Không có mã khởi động trong mô đun"
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Không có bên nào cung cấp giao thức `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Vô danh"
@@ -9322,7 +9422,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Trả lời xác thực từ server sai."
 
@@ -9455,20 +9555,7 @@ msgstr "Lỗi tra cứu máy chủ: không tìm thấy máy chủ"
 msgid "Host lookup failed: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: lỗi lạ"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "Bộ cung cấp thư mục ảo"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "Để đọc mail như là một truy vấn của một tập các thư mục khác"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Không có bên nào cung cấp giao thức `%s'"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9538,21 +9625,25 @@ msgstr "Server: %s, Kiểu: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Không thể lấy thư mục: thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, 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:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Không thể tạo thư mục: Thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "Rác"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9779,21 +9870,31 @@ msgstr "Không có thông điệp %s trong %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục Ảo"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, 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:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash 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/camel-vtrash-folder.c:46
+#, fuzzy
+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/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9812,16 +9913,11 @@ msgstr ""
 "này"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "Sổ địa chỉ"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
@@ -9841,43 +9937,41 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Mật khẩu"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "Mặc định"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "Sương mù dày đặc"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9886,26 +9980,26 @@ msgstr ""
 "Báo động từ IMAP server %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Lỗi lệnh IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Tính hiệu trả lời của server kết thúc quá sớm."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Tín hiệu trả lời của IMAP server không chứa thông tin %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Tín hiệu trả lời OK không mong đợi từ IMAP server: %s"
@@ -9920,7 +10014,7 @@ 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:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Thư mục đã bị hủy và tạo lại trên server."
 
@@ -9929,12 +10023,12 @@ msgstr "Thư mục đã bị hủy và tạo lại trên server."
 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:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, 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:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9950,25 +10044,25 @@ msgstr ""
 "Không thể lấy thông điệp: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 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:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 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:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 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"
 
@@ -10030,27 +10124,37 @@ msgstr ""
 "Áp dụng bộ lọc đối với những thông điệp mới trong thư mục INBOX trên server "
 "này"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, 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:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -10059,65 +10163,65 @@ msgstr "dịch vụ IMAP cho %s trên %s"
 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:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 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:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10128,24 +10232,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+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:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes 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:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục cha lạ: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 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"
 
@@ -10167,7 +10279,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Không thể kết nối tới POP server %s"
@@ -10250,8 +10362,8 @@ msgstr ""
 "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:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10263,55 +10375,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, 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:186
+#: camel/providers/local/camel-local-store.c:174
 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:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "Tập tin mail cục bộ %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta 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-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Không thể lưu tóm tắt: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Không thể thêm thông điệp vào bảng tóm tắt: nguyên nhân lạ"
 
@@ -10329,53 +10441,44 @@ msgstr "Không thể nối thêm thông điệp vào thư mục Maildir: %s: %s"
 msgid "Invalid message contents"
 msgstr "Nội dung thông điệp không hợp lệ"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Không thể mở thư mục `%s':\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Thư mục `%s' không tồn tại."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Không thể tạo thư mục `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' không phải là thư mục dạng Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Không thể xóa thư mục `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10397,9 +10500,9 @@ msgid "Checking for new messages"
 msgstr "Đang kiểm tra thông điệp mới"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Đang lưu thư mục"
@@ -10443,159 +10546,137 @@ msgstr "Thư mục này có vẽ đã bị hư và không thể được phục
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lỗi khởi tạo thông điệp: Hộp thư đã bị hỏng?"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Không thể mở tập tin `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Không thể tạo thư mục với tên đó"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Không thể tạo thư mục %s:\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Không thể đính kèm tập tin %s: không phải tập tin bình thường"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Không thể tạp tập tin `%s':\n"
+"Không thể xóa thư mục `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' không phải là tập tin bình thường."
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Không thể xóa thư mục `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Thư mục `%s' không rỗng. Chưa xóa."
 
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Không thể tạo thư mục với tên đó"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Không thể tạo thư mục %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Card ID đã tồn tại"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Tên thư mục xác định không hợp lệ: %s"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Không thể mở thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Lỗi nghiêm trọng khi phân tích mail gần vị trí %ld trong thư mục %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Không thể kiểm tra thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Không thể mở tập tin: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Không thể mở hộp thư tạm: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Không thể đóng thư mục nguồn %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Không thể đóng thư mục temp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Không thể đổi tên thư mục: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Bản tóm tắt và thư mục không khớp, kể cả sau khi đồng bộ"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Lỗi lạ: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Không thể lưu thư mục: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Lỗi ghi vào hộp thư tạm: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Lỗi ghi vào hộp thư tmp: %s: %s"
@@ -10609,10 +10690,17 @@ msgstr "Quá trình nối thêm thông điệp dạng MH đã bị hủy"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Không thể tạo thư mục `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' không phải là thư mục."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Không thể lấy thư mục: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10634,6 +10722,29 @@ msgstr "Spool `%s' không phải là tập tin hay thư mục bình thường"
 msgid "Folder `%s/%s' does not exist."
 msgstr "Thư mục `%s/%s' không tồn tại"
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Không thể mở thư mục `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Thư mục `%s' không tồn tại."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Không thể tạo thư mục `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10866,47 +10977,47 @@ msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Không thể chuyển thư mục vào một trong những con cháu của nó."
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "Lỗi lạ: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Không thể lấy nhóm: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Không thể lấy thông điệp: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Lỗi lệnh IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Đang quét tìm thông điệp mới"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Hồi đáp lại từ server: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Thao tác thất bại: %s"
@@ -10953,7 +11064,7 @@ msgstr "Xoá sau %s ngày"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11041,7 +11152,7 @@ msgid "No such folder `%s'."
 msgstr "Không có thư mục `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11094,7 +11205,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Gửi thư thông qua chương trình sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11260,7 +11371,7 @@ msgstr "Gửi thư (SMTP) thông qua %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Không thể gửi thông điệp: địaa chỉ người gửi không hợp lệ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
@@ -11366,34 +11477,34 @@ msgstr "Yêu cầu QUIT quá hạn: %s"
 msgid "QUIT response error"
 msgstr "Lỗi hồi đáp QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Loại bỏ những mục được chọn từ danh sách đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
@@ -11515,20 +11626,20 @@ 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:656
+#: composer/e-msg-composer.c:652
 #, 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:662
+#: composer/e-msg-composer.c:658
 #, 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:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11537,30 +11648,30 @@ msgstr ""
 "Lỗi đọc tập tin %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Tập tin đã tồn tại, ghi đè chứ?"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Lỗi lưu tập tin: %s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Lỗi nạp tập tin: %s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Lỗi truy cập tập tin: %s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 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:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11569,7 +11680,7 @@ msgstr ""
 "Không thể tìm trong tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11578,7 +11689,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11587,7 +11698,7 @@ msgstr ""
 "Không thể chép bộ mô tả tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11596,7 +11707,7 @@ msgstr ""
 "Lỗi tự động lưu thông điệp: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11605,7 +11716,7 @@ msgstr ""
 "Ximian Evolution đã tìm thấy các tập tin chưa được lưu từ session trước.\n"
 "Bạn có muốn phục hồi chúng không?"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11616,43 +11727,43 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "Chữ ký:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "Tự phát sinh"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "Biên soạn thông điệp"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11660,7 +11771,7 @@ 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:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11672,7 +11783,7 @@ msgstr ""
 "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:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11680,7 +11791,7 @@ 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:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12033,7 +12144,7 @@ msgstr "Thì"
 msgid "You must specify a folder."
 msgstr "Bạn phải xác định thư mục."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Chọn thư mục"
@@ -12048,19 +12159,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "Quan trọng"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "Cần làm"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "Sau đó"
 
@@ -12148,7 +12259,7 @@ msgstr ""
 "Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
 " điểm hiện thời, khi bộ lọc chạy."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "Thư mục ảo"
 
@@ -12164,7 +12275,7 @@ msgstr "trước"
 msgid "months"
 msgstr "tháng"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "giây"
 
@@ -12334,7 +12445,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:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Nhãn"
@@ -12442,9 +12553,10 @@ 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:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Chủ đề"
 
@@ -12452,25 +12564,25 @@ msgstr "Chủ đề"
 msgid "Unset Status"
 msgstr "Bỏ đặt trạng thái"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Tên quy tắt '%s' bị trùng, hãy chọn tên khác."
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "Quy tắc"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "Thêm quy tắc"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "Sửa quy tắc"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "Tên quy tắt"
 
@@ -12510,15 +12622,15 @@ msgstr "Chủ đề chứa"
 msgid "Subject does not contain"
 msgstr "Chủ đề không chứa"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "Bạn phải đặt tên cho vfolder này."
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "Bạn cần chọn ít nhất một thư mục làm nguồn."
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "Nguồn VFolder"
 
@@ -12576,9 +12688,9 @@ msgstr "Thành phần hiển thị thư mục của Evolution."
 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "Thư"
 
@@ -12586,7 +12698,7 @@ msgstr "Thư"
 msgid "Mail Accounts"
 msgstr "Tài khoản thư"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Thông số thư"
 
@@ -12624,15 +12736,15 @@ msgstr "Bạn phải xác định tên script hợp lệ."
 msgid "[script]"
 msgstr "[script]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "Ngôn ngữ"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "Thêm chữ ký tay"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "Chữ ký"
 
@@ -12719,7 +12831,6 @@ msgid "Unread messages"
 msgstr "Thông điệp chưa đọc _kế"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<nhấn đây để chọn thư mục>"
 
@@ -12727,313 +12838,330 @@ 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:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: 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:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Tên thư mục:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "Thư mục nhận"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "Đang nạp..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, 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:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Không thể xóa thư mục `%s': %s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
+
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Xoá \"%s\""
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Đổi tên thư mục \"%s\" thành:"
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Đổi tên thư mục"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "Di chuyển"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Thư mục mớ_i"
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "Đổi tên"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Thuộc tính..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "_In"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Đánh dấu đã đọ_c"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Lọc theo _người gửi"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "Mặc định"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Nhấn để thêm công việc"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Khớp:"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "Đã gán"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "Sửa chữ ký"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Sửa chữ ký"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13042,85 +13170,85 @@ 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Đã ngắt"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "Mã hóa PGP"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_ID Chứng nhận:"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Chứng nhận chưa hợp lệ"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, 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:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "Xem Inline"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "Ẩn"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "Trang %d trên %d"
@@ -13164,29 +13292,34 @@ msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 msgid "Formatting message"
 msgstr "Đang di chuyển thông điệp"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "Từ"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr ""
 
@@ -13200,8 +13333,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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"
 
@@ -13219,21 +13352,26 @@ msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã th�
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 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:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Lược đồ không hỗ trợ"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Không thể giải mã chữ ký chứng nhận"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Không thể giải mã chữ ký chứng nhận"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -13245,60 +13383,60 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Lỗi cache %s: %s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Lỗi cache %s: %s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "Lưu là..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Thông điệp không tựa"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Gửi _thông điệp cho danh sách..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Têm sổ địa chỉ"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
@@ -13348,18 +13486,18 @@ msgstr "Bộ lọc"
 msgid "-------- Forwarded Message --------"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, 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:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13368,7 +13506,7 @@ msgstr ""
 "Không thể lưu vào `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13377,32 +13515,38 @@ msgstr ""
 "`%s' đã tồn tại.\n"
 "Bạn có muốn ghi đè lên nó không?"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "Thông báo"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and 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/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "Địa chỉ"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Thừ từ %s"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Không thể tạo thư mục tạm: %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13415,7 +13559,7 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13443,318 +13587,326 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Cắt thông điệp đã chọn"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Cắt thông điệp đã chọn"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Tìm text trong thân thông điệp hiển thị"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Tìm text trong thân thông điệp hiển thị"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "Kiểu chuyển tiếp mặc định là: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "Cắt thông điệp đã chọn"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Cắt thông điệp đã chọn"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "Kiểu chuyển tiếp mặc định là: "
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "Bật tắt hiện thanh thư mục"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Bật tắt hiện thanh thư mục"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Sẽ gửi thông điệp sau"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "Tài khoản thư"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Thực hiện hành động"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Gửi thư mặc định dùng dạng HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Gửi thư mặc định dùng dạng HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Hiện thông điệp theo cách bình thường"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Khung xem thử"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "Liên lạc gốc:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13762,176 +13914,173 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Danh sách thông điệp theo nhánh"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Danh sách thông điệp theo nhánh"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "Nhập"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Đang nhập..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vui lòng chờ"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Đang nhập %s như là %s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "Đang quét %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Đang nhập tập tin"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13939,16 +14088,44 @@ msgstr ""
 "Evolution đã tìm thấy các tập tin thư dạng Elm.\n"
 "Bạn có muốn nhập nó vào Evolution?"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Xoá thư mục này"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Chọn bộ nhập"
+
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Đang nhập"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Đang nhập tập tin"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "Đang quét %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Bộ lọc ưu tiên \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13963,7 +14140,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13971,7 +14148,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13980,31 +14157,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 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:1995
-msgid "Scanning mail filters"
-msgstr "Đang quét bộ lọc thư"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Đang quét thư mục"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "Đang nhập"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution đang nhập các dữ liệu cũ từ Netscape"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "Bộ lọc thư"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14012,11 +14182,20 @@ msgstr ""
 "Evolution đã tìm thấy những tập tin thư dạng Netscape.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution đang nhập dữ liệu cũ từ Pine"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Đang nhập tập tin"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "Sổ địa chỉ"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -14024,7 +14203,7 @@ msgstr ""
 "Evolution tìm thấy các tập tin Pine.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -14068,19 +14247,19 @@ 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."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
@@ -14129,28 +14308,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 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-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "VFolder mới"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Bộ lọc thư"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Tạo thư mục mới"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI mà lịch sẽ hiển thị"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Thực thể"
 
@@ -14194,7 +14388,7 @@ msgstr ""
 "Vui lòng nhập thông tin về cách bạn gửi thư. Nếu bạn không chắc, hãy hỏi "
 "quản trị hệ thống hoặc ISP của bạn."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Bộ quản lý tài khoản"
 
@@ -14220,121 +14414,116 @@ msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Phiên bản Evolution đang dùng không hỗ trợ SSL)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Phiên bản Evolution đang dùng không hỗ trợ SSL)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Thông tin tài khoản"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Thêm _script"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Lưu chữ ký mới..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Luôn gửi (_Bcc) tới:"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Luôn gửi (_Cc) tới:"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Đính kèm thông điệp gốc"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đồ đính kèm"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "xác thực"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Bảng mã:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Màu sắc"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Kiểm tra chính tả khi đang _gõ"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Màu từ gõ _sai:"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Đang soạn thông điệp"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14349,283 +14538,279 @@ msgstr ""
 "\n"
 "Hãu nhấn \"Áp dụng\" để lưu các thiết lập."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Hành vi mặc định"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Bảng mã mặc định:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Đang xóa thư"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Không trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Xong"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Thư mục _nháp:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Tài khoản email"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Địa chỉ _email:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_ID Chứng nhận:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Độ rộng _cứng:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Ít tùy chọn hơn"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Thuộc tính font"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Định dạng thông điệp bằng _HTML"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Header"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Điểm sang _trích dẫn bằng"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Nhãn và màu"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Đang nạp ảnh"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Bộ soạn thảo thông điệp"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Hiển thị thông điệp"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Thông điệp chứa"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP/GPG:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Font in"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Đang nhận email"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Tùy chọn _nhận"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Thông tin yêu cầu"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Phục hồi mặc định"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME bảo mật (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Chọn font HTML độ rộng cứng"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Chọn font html độ rộng cứng để in"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Chọn font HTML độ rộng thay đổi"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu xác thực"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Xác định _tên tập tin:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14635,7 +14820,7 @@ msgstr ""
 "Tên bạn xác định sẽ chỉ được dùng cho mục đích\n"
 "hiển thị."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14644,7 +14829,7 @@ msgstr ""
 "Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để "
 "kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14652,15 +14837,15 @@ msgstr ""
 "Gõ tên mà bạn muốn dùng cho tài khoản này.\n"
 "Ví dụ: \"Work\" hoặc \"Personal\""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14670,177 +14855,177 @@ msgstr ""
 "\n"
 "Hãy nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Thêm chữ _ký"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Tự động chèn ảnh smiley"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Kêu bíp khi có thư mới"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Xác nhận khi xóa thư mục"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Chữ ký mặc định:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Đừn_g thông báo khi có thư mới"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Phong cách _chuyển tiếp:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Họ và tên:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Thư _HTML"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Thực thể"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Tháng Sáu"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Nạp ảnh nếu người gửi có trong sổ địa chỉ"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Đánh dấu sẽ đọ_c sau"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nhắc khi gửi thư không có chủ đề"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Nhận thư"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Phong cách trả lời:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Phục hồi _mặc định"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Xóa..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Đan_g gửi thư"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Chữ ký"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Liên lạc gốc:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
@@ -14863,7 +15048,7 @@ msgstr ""
 "Lỗi khi đang thực hiện thao tác:\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "Đang làm việc"
 
@@ -14875,128 +15060,128 @@ msgstr "Đang lọc thư mục"
 msgid "Fetching Mail"
 msgstr "Đang lấy thư"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, 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:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, 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:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Đang gửi \"%s\""
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Lỗi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "Đang lưu thông điệp vào thư mục"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét thư mục trong \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Đang nhập %s như là %s"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Đang lưu %d thông điệp"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15005,7 +15190,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15014,11 +15199,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15027,22 +15212,22 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -15077,39 +15262,39 @@ msgstr "Ngoại lệ"
 msgid "Security Information"
 msgstr "Thông tin tài khoản"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "Đang hủy bỏ..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Kiểu: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Đường dẫn: %s, Kiểu: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "Kiểu: %s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "Gửi và nhận thư"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Hủy tất cả"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "Đang cập nhập..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
@@ -15214,20 +15399,20 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Đang thử hiệu chỉnh thư mục ảo '%s' - không tồn tại."
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "VFolder mới"
 
@@ -15558,99 +15743,20 @@ msgstr "Đang lọc thư mục"
 msgid "Autocompletion Folders"
 msgstr "Thư mục tự động hoàn chỉnh"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Không thể sao chép thư mục: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Không thể di chuyển thư mục: %s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Không thể chuyển thư mục tới chính nó."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Không thể chép thư mục vào chính nó."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Không thể chuyển thư mục vào một trong những con cháu của nó."
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Xác định một thư mục để chép thư mục \"%s\" vào:"
-
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Chép thư mục"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Xác định một thư mục để chuyển thư mục \"%s\" tới:"
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "Chuyển thư mục"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Không thể xóa thư mục:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Không thể đổi tên thư mục:\n"
+"Không thể tạo thư mục đã cho:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Tên thư mục xác định không hợp lệ: %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Không thể loại bỏ thư mục:\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Không thể tạo thư mục đã cho:\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Không tựa)"
@@ -15791,7 +15897,7 @@ msgstr "Lỗi thực hiện GPG."
 msgid "_Import"
 msgstr "Nhập"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "Đang đóng kết nối..."
 
@@ -15830,6 +15936,10 @@ msgstr "Không thể mở thư mục chia sẽ: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Không tìm thấy thư mục chia sẽ xác định."
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "Đang nhập"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15940,126 +16050,6 @@ msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "Tạo nhóm lối tắt mới"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Tên nhóm:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "Bạn có thực sự muốn bỏ nhóm `%s' khỏi Thanh Lối tắt không?"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Đổi tên nhóm lối tắt"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Đổi tên nhóm lối tắt đã chọn thành:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Biểu tượng nhỏ"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Hiện lối tắt trên biểu tượng nhỏ"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Biểu tượng _lớn"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Hiện lối tắt trên biểu tượng lớn"
-
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "_Nhóm mới..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Tạo nhóm lối tắt mới"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "Loại bỏ nhóm này..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Loại bỏ nhóm lối tắt này"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "Đổi tên nhóm này..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Đổi tên nhóm lối tắt này"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "Ẩn thanh _lối tắt"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Ẩn Thanh lối tắt"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Tạo lối tắt _mặc định"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Tạo lối tắt mới"
-
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "Đổi tên lối tắt"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Đổi tên lối tắt đã chọn thành:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Mở thư mục liên kết của lối tắt này"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "Mở trong cửa sổ mới"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Mở thư mục liên kết của lối tắt này trong cửa sổ mới"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Đổi tên lối tắt"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Đổi tên"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Đổi tên lối tắt từ Thanh lối tắt"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "Lỗi lưu lối tắt"
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "Lối tắt"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Ô kiểm"
@@ -16070,11 +16060,6 @@ msgstr "Ô kiểm"
 msgid "New"
 msgstr "Mới"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" trong \"%s\""
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16375,59 +16360,59 @@ 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"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Chọn bộ nhập"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_ID Chứng nhận:"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "Tiến trình"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "Biểu thức"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Địa chỉ _email:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "Chứng nhận quá hạn: %s\n"
 "Đối tượng: %s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "Nhập mật khẩu cho %s"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16496,7 +16481,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "_ID Chứng nhận:"
@@ -16571,11 +16556,11 @@ msgstr "Đơn vị tổ chức"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16623,243 +16608,243 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Card ID đã tồn tại"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "B"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "Đồng ý"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "B"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Chứng nhận không đáng tin"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Khoá chung: "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Chủ để là %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Không thể xử lý thư mục spool"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Chứng nhận không đáng tin"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Lỗi xác minh chứng nhận."
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Không có thông tin"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "đồ đính kèm"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "Biểu thức"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s tại %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Lỗi chữ ký chứng nhận"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "_Chèn"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Chủ để là %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Lỗi chữ ký chứng nhận"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Nhập mật khẩu cho %s"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_ID Chứng nhận:"
@@ -17469,7 +17454,8 @@ msgid "_Threaded Message List"
 msgstr "Danh sách thông điệp nhánh"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17477,7 +17463,8 @@ msgid "A_pply Filters"
 msgstr "Á_p dụng bộ lọc"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "Thêm người gửi vào sổ địa chỉ"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17930,10 +17917,6 @@ msgstr "_Dạng thức"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Mở"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Mở tập tin"
@@ -18305,22 +18288,6 @@ msgstr "_Gửi / Nhận"
 msgid "_Window"
 msgstr "Tìm n_gay"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "In tóm tắt"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "In tóm tắt"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Nạp lại"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Nạp lại khung xem"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Theo Công t_y"
@@ -18386,8 +18353,8 @@ msgstr "Với _phân loại"
 msgid "_Tasks"
 msgstr "Nhiệm _vụ"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18637,23 +18604,23 @@ msgstr "_Tìm"
 msgid "_Find Now"
 msgstr "Tìm n_gay"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Xóa"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "ID mục"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "ID mục con"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "Văn bản"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "Tìm ngay"
@@ -18668,6 +18635,208 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "Nguồn sổ địa chỉ"
+
+#~ msgid "No data provided"
+#~ msgstr "Chưa cung cấp dữ liệu"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể mở tập tin `%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể tạo thư mục %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể tạp tập tin `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' không phải là thư mục."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "Đang nhập %s như là %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "Đang quét bộ lọc thư"
+
+#~ msgid "Scanning directory"
+#~ msgstr "Đang quét thư mục"
+
+#, fuzzy
+#~ msgid "    "
+#~ msgstr "      "
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "Không thể sao chép thư mục: %s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "Không thể di chuyển thư mục: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Không thể chuyển thư mục tới chính nó."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Không thể chép thư mục vào chính nó."
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "Không thể chuyển thư mục vào một trong những con cháu của nó."
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Xác định một thư mục để chép thư mục \"%s\" vào:"
+
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "Chép thư mục"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Xác định một thư mục để chuyển thư mục \"%s\" tới:"
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "Chuyển thư mục"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể xóa thư mục:\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể đổi tên thư mục:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể loại bỏ thư mục:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Tạo nhóm lối tắt mới"
+
+#~ msgid "Group name:"
+#~ msgstr "Tên nhóm:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "Bạn có thực sự muốn bỏ nhóm `%s' khỏi Thanh Lối tắt không?"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Đổi tên nhóm lối tắt"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Đổi tên nhóm lối tắt đã chọn thành:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "_Biểu tượng nhỏ"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Hiện lối tắt trên biểu tượng nhỏ"
+
+#~ msgid "_Large Icons"
+#~ msgstr "Biểu tượng _lớn"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Hiện lối tắt trên biểu tượng lớn"
+
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "_Nhóm mới..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "Tạo nhóm lối tắt mới"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "Loại bỏ nhóm này..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Loại bỏ nhóm lối tắt này"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "Đổi tên nhóm này..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Đổi tên nhóm lối tắt này"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "Ẩn thanh _lối tắt"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Ẩn Thanh lối tắt"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Tạo lối tắt _mặc định"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Tạo lối tắt mới"
+
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "Đổi tên lối tắt"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Đổi tên lối tắt đã chọn thành:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Mở thư mục liên kết của lối tắt này"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "Mở trong cửa sổ mới"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Mở thư mục liên kết của lối tắt này trong cửa sổ mới"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "Đổi tên lối tắt"
+
+#~ msgid "Re_move"
+#~ msgstr "Đổi tên"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Đổi tên lối tắt từ Thanh lối tắt"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "Lỗi lưu lối tắt"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Lối tắt"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\" trong \"%s\""
+
+#~ msgid "Print Summary"
+#~ msgstr "In tóm tắt"
+
+#~ msgid "Print summary"
+#~ msgstr "In tóm tắt"
+
+#~ msgid "Reload"
+#~ msgstr "Nạp lại"
+
+#~ msgid "Reload the view"
+#~ msgstr "Nạp lại khung xem"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "Chép vào thư mục..."
 
@@ -19301,21 +19470,9 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Kỷ niệm"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Trợ tá bộ nhập Evolution"
-
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Trợ tá bộ nhập Evolution"
 
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Bộ soạn thư của Evolution."
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Bộ soạn thư của Evolution."
-
 #~ msgid "Searching..."
 #~ msgstr "Đang tìm..."
 
@@ -27278,10 +27435,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Appointments"
 #~ msgstr "Cuộc hẹn"
 
-#, fuzzy
-#~ msgid "No appointments."
-#~ msgstr "Không có cuộc hẹn"
-
 #~ msgid "%k:%M %d %B"
 #~ msgstr "%k:%M %d %B"
 
@@ -27783,9 +27936,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Moderate mist"
 #~ msgstr "Sương mù vừa"
 
-#~ msgid "Thick mist"
-#~ msgstr "Sương mù dày đặc"
-
 #~ msgid "Shallow mist"
 #~ msgstr "Mụ loáng thoáng"
 
@@ -28302,9 +28452,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "Tạo cửa sổ mới hiển thị thư mục này"
 
-#~ msgid "Delete this folder"
-#~ msgstr "Xoá thư mục này"
-
 #~ msgid "Display a different folder"
 #~ msgstr "Hiển thị thư mục khác"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 79d62e9483..be99ec7b97 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\n"
 "PO-Revision-Date: 2004-01-25 07:08+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -50,8 +50,7 @@ msgstr "在这里配置自动完成"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "联系人"
 
@@ -91,19 +90,20 @@ msgstr "Evolution 文件夹配置控件"
 msgid "Manager your S/Mime certificates here"
 msgstr "在此管理您的 S/Mime 证书"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除地址簿“%s”。您确定想要继续吗？"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "New Addressbook"
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "New Address Book"
 msgstr "新建地址簿"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -111,65 +111,65 @@ msgstr "新建地址簿"
 msgid "Delete"
 msgstr "删除"
 
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "属性..."
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "联系人(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "创建一个新联系人"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "新建联系人列表"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "连接 LDAP 服务器失败"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 服务器认证失败"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "无法在根 DSE 上执行查询"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "服务器响应为没有支持的搜索起点"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "此服务器不支持 LDAPv3 schema 信息"
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "检索 schema 信息错误"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr "服务器没有响应有效的 schema 信息"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
 msgstr "正在升迁..."
 
@@ -185,39 +185,41 @@ msgstr ""
 "请稍候，Evolution 正在升迁您的文件夹..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, c-format
 msgid "Migrating `%s':"
 msgstr "升迁“%s”："
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr "在此计算机中"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "个人"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
 msgstr "在 LDAP 服务器上"
 
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 msgid "LDAP Servers"
 msgstr "LDAP 服务器"
 
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 msgid "Autocompletion Settings"
 msgstr "自动完成设置"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -228,7 +230,7 @@ msgstr ""
 "Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
 "搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -239,19 +241,19 @@ msgstr ""
 "请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
 "中将时间限制调高。"
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此地址簿的后端无法解析此查询。"
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此地址簿的后端拒绝执行此查询。"
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "此查询未成功完成。"
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -260,7 +262,7 @@ msgstr ""
 "我们无法打开此地址簿。请检查路径是否存在\n"
 "以及您是否有足够的权限访问它。"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -270,7 +272,7 @@ msgstr ""
 "您输入了错误的 URI，也可能是因为\n"
 "LDAP 服务器已经关闭。"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -282,7 +284,7 @@ msgstr ""
 "以下链接获取 OpenLDAP，然后从程序的 CVS 源代码\n"
 "重新编译程序。\n"
 
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -292,28 +294,33 @@ msgstr ""
 "您输入了错误的 URI，也可能是因为\n"
 "服务器已经关闭。"
 
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "无法打开地址簿"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s为 %s 输入口令 (用户 %s)"
 
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "日历将显示的 URI"
 
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "日历将显示的 URI"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -357,7 +364,7 @@ msgstr " 显示支持的基础(_H) "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -389,19 +396,22 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
+#, fuzzy
+msgid "Address Book Creation Assistant"
 msgstr "地址簿创建助手"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Properties"
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "地址簿属性"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "地址簿源"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "地址簿来源..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "总是"
 
@@ -412,7 +422,8 @@ msgstr "匿名"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -420,50 +431,50 @@ msgstr ""
 "\n"
 "请单击“完成”按钮保存您在此输入的设置。"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "连接"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "识别性名称(_N)："
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Email address:"
 msgstr "电子邮件地址："
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "已完成"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "常规"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "组："
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "从不"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -476,23 +487,23 @@ msgstr ""
 "字层)或TLS(传输层安全)协议来加密保护您的连接。请询问您的系统管理员关于您\n"
 "的 LDAP 服务器使用何种协议的信息。"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "一级"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "搜索范围(_E)："
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "搜索"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "已选择："
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -501,7 +512,7 @@ msgstr ""
 "选中此选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
 "SSL 或 TLS 时才连接到您的 LDAP 服务器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -515,7 +526,7 @@ msgstr ""
 "例如，如果您和您的 LDAP 服务器工作时位于防火墙后，Evolution 就没有必\n"
 "要使用 SSL/TLS，因为您的连接已经相当安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -526,7 +537,7 @@ msgstr ""
 "选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是\n"
 "您的连接不太安全，您也易于受到安全漏洞的攻击。"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -535,39 +546,40 @@ msgid ""
 msgstr ""
 "选择此选项可让您更改 Evolution 对 LDAP 搜索及创建和编辑联系人所用的默认设置。"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr "指定显示名称是配置 LDAP 服务器所需的最后一个步骤。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Step 2: Server Information"
 msgstr "第二步：服务器信息"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Step 3: Connecting to Server"
 msgstr "第三步：连接服务器"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "Step 4: Searching the Directory"
 msgstr "第四步：搜索目录"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "子级"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "支持的搜索起点"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -578,7 +590,7 @@ msgstr ""
 "本页中的选项控制了在您的搜索中应当包含多少项，以及搜索将花费的时间。\n"
 "如果您需要更改这些选项，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -588,7 +600,7 @@ msgstr ""
 "搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空，搜索将从目\n"
 "录树的根开始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -601,12 +613,13 @@ msgstr ""
 "指定的搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜\n"
 "索基础之下一级的项目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -615,22 +628,23 @@ msgstr ""
 "添加新的 LDAP 服务器需要关于服务器的一些专业化信息。如果您对这些信\n"
 "息不太了解的话，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "这是可下载条目的最大数量。将此数值设定\n"
 "得太大将导致地址簿变慢。"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 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 +653,7 @@ msgstr ""
 "这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
 "对 ldap 服务器的匿名访问权限。"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -648,7 +662,7 @@ msgstr ""
 "这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
 "它只用于显示。"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -658,7 +672,7 @@ msgstr ""
 "这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
 "它只用于显示。"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -668,28 +682,28 @@ msgstr ""
 "这是 LDAP 服务器上的端口，Evolution 将试图连接到您所给出的标准端口列表。\n"
 "如果您不清楚要指定端口，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "此选项控制搜索将运行多长时间。"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "使用 _SSL/TLS："
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "可能时"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -700,19 +714,19 @@ msgstr ""
 "配置 LDAP 服务器的第一个步骤是提供其名称，以及您的登录信息。\n"
 "如果您对这些信息不太了解，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "显示名称(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "下载上限(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -721,39 +735,39 @@ msgstr "下载上限(_D)："
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "登录方式(_L)："
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "端口号(_P)："
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "搜索起点(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "服务器名(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "超时(分钟)(_T)："
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "卡片"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "connecting-tab"
 msgstr "连接-页"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "常规-页"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "搜索-页"
 
@@ -868,7 +882,7 @@ msgstr "合作"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -958,10 +972,10 @@ msgstr "类别(_C)..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1009,15 +1023,15 @@ msgid "_Web page address:"
 msgstr "网页地址(_W)："
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "地址"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2005,153 +2019,167 @@ msgid "AOL Instant Messenger"
 msgstr "AOL 即时通讯程序"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+#, fuzzy
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "雅虎通"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "Service"
 msgstr "服务"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 msgid "Location"
 msgstr "位置"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "用户名"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "家庭"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "工作"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "其它"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "联系人"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "已更改"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "账户名"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "类别编辑器不可用。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "此联系人属于这些类别："
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "将联系人保存为 VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr "您确定要删除这些联系人吗？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "您确定要删除此联系人吗？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "商务"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "无法为域找到构件：“%s”"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Full Name:"
 msgstr "全名(_F)："
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "电子邮件(_M)："
 
@@ -2307,11 +2335,11 @@ msgid "Is New List"
 msgstr "为新列表"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "将列表保存为 VCard"
 
@@ -2400,13 +2428,13 @@ msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "类别为"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "任何域含有"
 
@@ -2423,101 +2451,100 @@ msgid "Type"
 msgstr "类型"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book"
 msgstr "地址簿"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "保存为 VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "新建联系人..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "新建联系人列表..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "转到文件夹..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "导入..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "搜索联系人..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "地址簿来源..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot 设置..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "转发联系人"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "给联系人发邮件"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "打印"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "打印信封"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "地址簿..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "地址簿..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪切"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "复制"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "粘贴"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "当前视图"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2528,8 +2555,8 @@ msgstr ""
 "的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "任何类别"
 
@@ -2572,7 +2599,7 @@ msgid "Company Phone"
 msgstr "公司电话"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "电子邮件"
 
@@ -2632,7 +2659,7 @@ msgid "Nickname"
 msgstr "昵称"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "注释"
 
@@ -2641,7 +2668,7 @@ msgid "Office"
 msgstr "办公室"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "组织"
 
@@ -2767,67 +2794,73 @@ msgstr "已选择"
 msgid "Has Cursor"
 msgstr "有光标"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 msgid "List Members"
 msgstr "列出成员"
 
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "工作"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "描述"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "组"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "视频会议 URL(_V)："
 
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "车载电话"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "个人"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 msgid "Job Title"
 msgstr "职称"
 
-#: addressbook/gui/widgets/eab-contact-display.c:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 msgid "Home page"
 msgstr ""
 
@@ -2836,8 +2869,8 @@ msgid "Success"
 msgstr "成功"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -2867,7 +2900,7 @@ msgstr "不支持的协议"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -2887,7 +2920,8 @@ msgid "TLS not Available"
 msgstr "TLS 不可用"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "地址簿不存在"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
@@ -3022,7 +3056,8 @@ msgid "Add address to existing contact \"%s\""
 msgstr "为现有的联系人“%s”添加地址"
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "正在查询地址簿..."
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
@@ -3077,17 +3112,40 @@ msgstr "版权 (C) 2000, Ximian, Inc."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution Elm 导入器"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution iCalendar 导入器"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution vCalendar 导入器"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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:1008
+#: addressbook/printing/e-contact-print.c:1009
 msgid "Print contacts"
 msgstr "打印联系人"
 
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 msgid "Print contact"
 msgstr "打印联系人"
 
@@ -3179,7 +3237,7 @@ msgstr "边界"
 msgid "Number of columns:"
 msgstr "列数："
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "选项"
 
@@ -3356,8 +3414,8 @@ msgstr "没有提供文件名。"
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
-#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 msgid "Enter password"
 msgstr "输入密码"
 
@@ -3434,10 +3492,9 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution 任务组件"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "任务"
 
@@ -3481,26 +3538,24 @@ msgstr "午睡时间(分钟)"
 msgid "_Edit appointment"
 msgstr "编辑约会(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "打开(_O)"
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "打开"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "没有描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3509,12 +3564,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3526,7 +3581,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3542,19 +3597,19 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "无法初始化 Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "无法创始化 gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "无法创建提醒服务车间"
 
@@ -3698,24 +3753,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "描述含有"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "注释含有"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "描述含有"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "日历"
 
@@ -3747,7 +3808,7 @@ 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.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%m月%d日%A"
 
@@ -3769,70 +3830,70 @@ msgstr "%Y年%m月%d日"
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除日历“%s”。您确定想要继续吗？"
 
-#: calendar/gui/calendar-component.c:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "新建约会"
 
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "新闻会议"
 
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: calendar/gui/calendar-component.c:615
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "全天约会(_D)"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
 msgstr "新建日历"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
 msgstr "日历(_A)"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -3964,7 +4025,7 @@ msgstr "小时"
 msgid "minutes"
 msgstr "分钟"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4037,7 +4098,7 @@ msgid "hour(s)"
 msgstr "小时"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -4048,7 +4109,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "已启用"
 
@@ -4098,7 +4159,7 @@ msgstr "30 分钟"
 msgid "60 minutes"
 msgstr "60 分钟"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "警告"
 
@@ -4123,7 +4184,7 @@ msgid "Days"
 msgstr "天数"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "启用(_N)"
 
@@ -4263,7 +4324,7 @@ msgid "_Fri"
 msgstr "周五(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "常规(_G)"
 
@@ -4361,7 +4422,7 @@ msgstr ""
 "请单击“完成”按钮保存您在此输入的设置。"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "新建任务列表"
 
@@ -4517,23 +4578,23 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " 到 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (完成 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "已完成 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 msgid " (Due "
 msgstr " (预定 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "预定 "
 
@@ -4569,8 +4630,8 @@ msgstr "日志条目 - %s"
 msgid "No summary"
 msgstr "没有概要"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "另存为..."
 
@@ -4598,9 +4659,20 @@ msgstr "投递目的"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-msgid "Select destination source"
-msgstr ""
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
+msgstr "投递目的"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "日历"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "新建任务列表"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4708,7 +4780,7 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "约会"
 
@@ -4732,23 +4804,32 @@ msgstr "调度"
 msgid "Meeting"
 msgstr "会议"
 
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:458
+#, fuzzy
+msgid "Event with no start date"
+msgstr "到期日期先于开始日期！"
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
@@ -4824,29 +4905,29 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "无"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "需要至少一个参加者。"
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "授权于(_D)..."
 
@@ -5031,7 +5112,7 @@ msgstr "在"
 msgid "occurrences"
 msgstr "循环"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "日期/时间"
 
@@ -5064,7 +5145,7 @@ msgid "_No recurrence"
 msgstr "不再现(_N)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "删除(_R)"
 
@@ -5106,7 +5187,7 @@ msgstr ""
 "\n"
 "您希望保存改动吗？"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "丢弃修改(_D)"
 
@@ -5130,7 +5211,7 @@ msgstr "任务分配信息已创建。发送此信息吗？"
 msgid "The task information has changed. Send an updated version?"
 msgstr "任务信息已经改变。发送更新版本？"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
@@ -5143,7 +5224,7 @@ msgstr "完成百分比(_C)"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "已完成"
 
@@ -5156,7 +5237,7 @@ msgstr "高"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "正在进行中"
 
@@ -5175,7 +5256,7 @@ msgstr "中"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -5214,16 +5295,16 @@ msgstr "基本"
 msgid "Assignment"
 msgstr "指派"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "到期日期先于开始日期！"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
@@ -5234,7 +5315,7 @@ msgstr "机密(_F)"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "描述："
 
@@ -5418,11 +5499,10 @@ msgstr "开始日期"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "概要"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "颜色"
 
@@ -5447,7 +5527,7 @@ msgstr "北"
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "东"
 
@@ -5482,10 +5562,10 @@ msgstr "否"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "未知"
@@ -5498,99 +5578,105 @@ msgstr "重复"
 msgid "Assigned"
 msgstr "已委派"
 
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "更新对象"
 
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "新会议"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "新建任务"
 
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "发布忙闲信息(_P)"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: 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-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "设置(_S)..."
 
@@ -5677,7 +5763,7 @@ msgid "Alarms"
 msgstr "提醒"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "完成"
 
@@ -5735,26 +5821,26 @@ msgstr "%02i 分钟分割"
 
 #. 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "下午"
@@ -5935,7 +6021,7 @@ msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -6388,12 +6474,12 @@ msgstr "优先级："
 msgid "Web Page:"
 msgstr "网页："
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, c-format
 msgid "Click to open %s"
 msgstr "点击以打开 %s"
 
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6403,7 +6489,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6411,12 +6497,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6425,28 +6511,38 @@ msgstr ""
 "打开 %s 出错：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "正在完成的日期..."
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "销毁"
 
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "装入任务"
+
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "约会 - %s"
+
+#: calendar/gui/gnome-cal.c:1796
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6566,16 +6662,16 @@ msgstr "忙闲信息 (%s 到 %s)"
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "输入 %s 的密码"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -6587,7 +6683,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
@@ -6599,12 +6695,12 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -6793,49 +6889,49 @@ msgstr "选中的月(%Y年%m月)"
 msgid "Selected year (%Y)"
 msgstr "选中的年(%Y年)"
 
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "任务"
 
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "联系人："
 
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "打印项"
 
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "打印设置"
 
@@ -6844,36 +6940,36 @@ msgstr "打印设置"
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除任务列表“%s”。您确定想要继续吗？"
 
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "新建任务"
 
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 msgid "New task list"
 msgstr "新建任务列表"
 
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 msgid "_Task List"
 msgstr "任务列表(_T)"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6929,20 +7025,20 @@ msgstr "iCalendar 文件(.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 文件(.vcf)"
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "含有约会和事件的公共文件夹"
 
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "提醒!!"
 
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6950,7 +7046,7 @@ msgstr ""
 "Evolution 已找到 Gnome 日历文件。\n"
 "您是否原意把它们导入 Evolution？"
 
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
@@ -8612,7 +8708,7 @@ msgstr "无法打开消息"
 msgid "Failed on message %d"
 msgstr "在消息 %d 失败"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "正在同步文件夹"
 
@@ -8697,7 +8793,7 @@ msgstr "复制邮件"
 msgid "Filtering new message(s)"
 msgstr "过滤新邮件"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8708,15 +8804,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示失败。"
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密码句请求失败。"
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8725,30 +8821,26 @@ msgstr ""
 "您需要一个密码句用来解锁以下用户：\n"
 "“%s”"
 
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解锁密钥失败：给出了 3 个错误的密码句。"
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 GnuPG 的意外应答：%s"
 
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "未提供数据"
-
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "加密失败：没有指定有效的收件人。"
 
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1124
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8759,59 +8851,59 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s 失败：%s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "无法写数据：%s"
 
-#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "执行 gpg 失败：%s"
 
-#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "执行 gpg 失败。"
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "这是消息的数字签名部分"
 
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "无法校验邮件签名：无法创建临时文件：%s"
 
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "无法校验邮件签名：无法创建临时文件：%s"
 
-#: camel/camel-gpg-context.c:1483
+#: camel/camel-gpg-context.c:1484
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "无法生成加密数据：%s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
 msgstr "这是邮件的数字加密部分"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
 msgstr "加密内容"
 
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 msgid "Unable to parse message content"
 msgstr "无法分析邮件内容"
 
@@ -8921,21 +9013,34 @@ msgstr "解密 MIME 部分失败：无效的结构"
 msgid "parse error"
 msgstr "解析错误"
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "虚拟文件夹电子邮件提供者"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "关于将读入邮件作为对另一组文件夹的查询"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "无法装入 %s：本系统不支持模块装入。"
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "无法装入 %s：%s"
 
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "无法装入 %s：模块中没有初始化代码。"
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "协议“%s”没有可用的提供者"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "匿名"
@@ -9081,7 +9186,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -9214,20 +9319,7 @@ msgstr "主机寻找失败：没有找到主机"
 msgid "Host lookup failed: unknown reason"
 msgstr "主机寻找失败：未知的原因"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "虚拟文件夹电子邮件提供者"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "关于将读入邮件作为对另一组文件夹的查询"
-
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "协议“%s”没有可用的提供者"
-
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9297,21 +9389,25 @@ msgstr "服务器：%s，类型：%s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "无法获取文件夹：对该存储的无效操作"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "无法创建文件夹：%s：%s"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹：对该存储的无效操作"
 
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹：%s：无效操作"
 
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "回收站"
 
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9544,21 +9640,31 @@ msgstr "在 %2$s 中没有消息 %1$s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹：%s：没有该文件夹"
 
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹：%s：无效操作"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹：%s：没有该文件夹"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "无法关闭临时文件夹：%s"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "无法关闭临时文件夹：%s"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -9574,14 +9680,10 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "应用过滤规则到此服务器上收件箱中的新邮件"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
 msgstr "自动将远程邮件同步到本地"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "Address Book"
-msgstr "地址簿"
-
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "LDAP Server Name:"
 msgstr "LDAP 服务器名："
@@ -9600,42 +9702,40 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "访问 Novell GroupWise 服务器"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "密码"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "默认"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "列表"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "服务器意外地中止了连接：%s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9644,26 +9744,26 @@ msgstr ""
 "来自 IMAP 服务器 %s@%s 的提醒：\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "来自 IMAP 服务器的意外应答：%s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 命令失败：%s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "服务器应答结束太快。"
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 服务器应答不含有 %s 信息"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "来自 IMAP 服务器意外的 OK 应答：%s"
@@ -9678,7 +9778,7 @@ msgstr "无法创建目录 %s：%s"
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "文件夹已被删除并在服务器上重建了。"
 
@@ -9687,12 +9787,12 @@ msgstr "文件夹已被删除并在服务器上重建了。"
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "无法检索邮件：%s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9708,25 +9808,25 @@ msgstr ""
 "无法获取邮件：%s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: 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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 msgid "Fetching summary information for new messages"
 msgstr "从新邮件中获取概要信息"
 
-#: camel/providers/imap/camel-imap-folder.c:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "无法在 FETCH 应答中找到邮件体。"
 
@@ -9781,27 +9881,37 @@ msgstr "命名空间"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "在所有文件夹中检查新邮件"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "在所有文件夹中检查新邮件"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 服务器 %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -9810,64 +9920,64 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "无法连接到 %s (端口 %d)：%s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: 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:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "不支持 SSL/TLS 扩展。"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 协商失败"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "无法使用命令“%s”连接：%s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9878,24 +9988,32 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "无法创建文件夹：%s：%s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
 
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知的父文件夹：%s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
@@ -9916,7 +10034,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "无法连接到 POP 服务器 %s"
@@ -9999,8 +10117,8 @@ msgstr ""
 "也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。"
 
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10012,55 +10130,55 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹：%s：%s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "本地存储没有收件箱"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地邮件文件 %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "无法将文件夹 %s 改名为 %s：%s"
 
-#: camel/providers/local/camel-local-store.c:372
+#: camel/providers/local/camel-local-store.c:360
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "无法重命名“%s”：%s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "无法删除文件夹元文件“%s”：%s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "无法保存概要：%s：%s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "无法将邮件添加到概要中：未知的原因"
 
@@ -10078,53 +10196,44 @@ msgstr "无法将邮件附加到邮件目录文件夹：%s：%s"
 msgid "Invalid message contents"
 msgstr "无效的邮件内容"
 
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"无法打开文件夹 “%s”：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "无法获取文件夹：%s：%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "文件夹“%s”不存在。"
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"无法创建文件夹“%s”：\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "无法创建文件夹：%s：%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "“%s”不是邮件目录。"
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "无法删除文件夹“%s”：%s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "不是邮件目录"
 
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10146,9 +10255,9 @@ msgid "Checking for new messages"
 msgstr "正在检查新邮件"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "存储文件夹"
@@ -10192,156 +10301,134 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "邮件构造失败：邮件箱已损坏？"
 
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"无法打开文件“%s”：\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "无法以此名称创建文件夹。"
 
-#: camel/providers/local/camel-mbox-store.c:170
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"无法创建目录 %s：\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "无法附加文件 %s：不是普通文件"
 
-#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"无法创建文件“%s”：\n"
+"无法删除文件夹“%s”：\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "“%s”并不是普通文件。"
 
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"无法删除文件夹“%s”：\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "文件夹“%s”非空。没有删除。"
 
-#: camel/providers/local/camel-mbox-store.c:341
-msgid "Cannot create a folder by this name."
-msgstr "无法以此名称创建文件夹。"
-
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "无法创建目录“%s”：%s"
 
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "文件夹已经存在"
 
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "指定的文件夹名称不合法。"
 
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "无法重命名“%s”：%s"
 
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "无法将 %s 改名为 %s：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "无法打开文件夹：%s：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "无法检查文件夹：%s：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "无法打开文件：%s：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "无法打开临时邮件箱：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "无法关闭来源文件夹 %s：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "无法关闭临时文件夹：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "无法重命名文件夹：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "即使同步后，概要和文件夹仍然不匹配"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知的错误：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "无法存储文件夹：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "写入临时文件夹错误：%s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "写入临时文件夹失败：%s：%s"
@@ -10355,10 +10442,17 @@ msgstr "已取消 MH 附件邮件"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "无法将邮件附加到 mh 文件夹：%s：%s"
 
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"无法创建文件夹“%s”：\n"
+"%s"
+
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "“%s”不是目录"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "无法获取文件夹：%s：%s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10380,6 +10474,29 @@ msgstr "脱机文件“%s”不是普通文件或目录"
 msgid "Folder `%s/%s' does not exist."
 msgstr "文件夹“%s/%s”不存在。"
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"无法打开文件夹 “%s”：\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "文件夹“%s”不存在。"
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"无法创建文件夹“%s”：\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -10615,47 +10732,47 @@ msgstr "无法将文件夹 %s 改名为 %s：%s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "无法把文件夹移动到其子目录。"
 
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "未知的错误：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "没有文件夹：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "无法获取组：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "无法发送邮件：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP 命令失败：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s：正在扫描新消息"
 
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "未知的服务器应答：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "使用取消"
 
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作失败：%s"
@@ -10702,7 +10819,7 @@ msgstr "%s 天之后删除"
 msgid "Disable support for all POP3 extensions"
 msgstr "禁用所有 POP3 扩展的支持"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10788,7 +10905,7 @@ msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10840,7 +10957,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11006,7 +11123,7 @@ msgstr "通过 %s 发送 SMTP 邮件"
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送邮件：发件人地址不合法。"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "正在发送邮件"
 
@@ -11112,34 +11229,34 @@ msgstr "QUIT 请求超时：%s"
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "附件"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "从附件列表中删除选定的条目"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "添加附件..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "把文件附件到邮件"
 
@@ -11255,19 +11372,19 @@ msgstr "<点击这里以便选择文件夹>"
 msgid "Attach file(s)"
 msgstr "添加附件"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "当使用该账户时总是发送签名邮件(_A)"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11276,30 +11393,30 @@ msgstr ""
 "读入文件 %s 时发声错误：\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "文件存在，覆盖它？"
 
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误：%s"
 
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误：%s"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误：%s"
 
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器检索邮件"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11308,7 +11425,7 @@ msgstr ""
 "无法搜索文件：%s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11317,7 +11434,7 @@ msgstr ""
 "无法截断文件：%s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11326,7 +11443,7 @@ msgstr ""
 "无法复制文件描述符：%s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11335,7 +11452,7 @@ msgstr ""
 "自动存储邮件错误：%s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -11344,7 +11461,7 @@ msgstr ""
 "Ximian Evolution 发现上次会话含有未保存的文件。\n"
 "您是否希望恢复它们？"
 
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11355,42 +11472,42 @@ msgstr ""
 "\n"
 "您是否希望保存修改？"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "警告：已改动的邮件"
 
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "打开文件"
 
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "签名："
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, 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:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "隐藏附件栏(将附件拖至此处)(_A)"
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "显示附件栏(将附件拖至此处)(_A)"
 
-#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "撰写邮件"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11398,7 +11515,7 @@ msgstr ""
 "无法创建撰写窗口：\n"
 "无法激活地址选择控制。"
 
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11410,7 +11527,7 @@ msgstr ""
 "请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
 "本正确。\n"
 
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11418,7 +11535,7 @@ msgstr ""
 "无法创建撰写窗口：\n"
 "无法激活 HTML 编辑器组件。"
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11763,7 +11880,7 @@ msgstr "则"
 msgid "You must specify a folder."
 msgstr "您必须指定文件夹。"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "选择文件夹"
@@ -11778,19 +11895,19 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "重要"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "待办"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "稍候"
 
@@ -11872,7 +11989,7 @@ msgid ""
 "the current time when filtering occurs."
 msgstr "邮件的日期将会在过滤执行时与当前时间进行比较。"
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "虚拟文件夹"
 
@@ -11888,7 +12005,7 @@ msgstr "过去"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "秒"
 
@@ -12058,7 +12175,7 @@ msgstr "未标志"
 msgid "Junk Test"
 msgstr "六月"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "标签"
@@ -12166,9 +12283,10 @@ msgstr "以之开始"
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "主题"
 
@@ -12176,25 +12294,25 @@ msgstr "主题"
 msgid "Unset Status"
 msgstr "未设置状态"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "规则名“%s”不唯一，请另外选择一个名称。"
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "规则"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "编辑规则"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "规则名"
 
@@ -12234,15 +12352,15 @@ msgstr "主题含有"
 msgid "Subject does not contain"
 msgstr "主题不含有"
 
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "您必须为该虚拟文件夹命名。"
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "您至少需要把一个文件夹指定为源。"
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "虚拟文件夹来源"
 
@@ -12291,9 +12409,9 @@ msgstr "Evolution 邮件文件夹查看器"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 邮件首选项控件"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "邮件"
 
@@ -12301,7 +12419,7 @@ msgstr "邮件"
 msgid "Mail Accounts"
 msgstr "邮件账户"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
@@ -12339,15 +12457,15 @@ msgstr "您必须指定有效的脚本名。"
 msgid "[script]"
 msgstr "[脚本]"
 
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "语言"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "添加脚本签名"
 
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "签名"
 
@@ -12427,7 +12545,6 @@ msgid "Unread messages"
 msgstr "下一封未读邮件"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<点击这里以便选择文件夹>"
 
@@ -12435,385 +12552,402 @@ msgstr "<点击这里以便选择文件夹>"
 msgid "Create New Folder"
 msgstr "创建新文件夹"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "收件箱"
 
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "正在装入..."
 
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "无法重命名文件夹：%s：无效操作"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 msgid "Create folder"
 msgstr "创建文件夹"
 
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "无法删除文件夹：%s"
 
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "无法删除文件夹：%s：没有该文件夹"
+
+#: mail/em-folder-tree.c:2100
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "您真的要删除文件夹“%s”及其全部子文件夹吗？"
 
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "删除“%s”"
 
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "无法重命名文件夹：%s：没有该文件夹"
+
+#: mail/em-folder-tree.c:2153
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
 
-#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 msgid "Rename Folder"
 msgstr "重命名文件夹"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
 
-#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 msgid "Open in _New Window"
 msgstr "在新窗口中打开(_N)"
 
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 msgid "_Move"
 msgstr "移动(_M)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: mail/em-folder-tree.c:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "属性(_P)..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "跟随(_W)..."
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:763
 msgid "Fla_g Completed"
 msgstr "已完成标志(_G)"
 
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_M)"
 
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "标记为未读(_U)"
 
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "标记为重要(_I)"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_V)..."
 
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿(_B)"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "应用过滤规则(_Y)"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "从邮件创建规则(_T)"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "基于主题的虚拟文件夹(_S)"
 
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "基于发件人的虚拟文件夹(_N)"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "基于收件人的虚拟文件夹(_R)"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "基于邮件列表的虚拟文件夹(_L)"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 msgid "VFolder on Thread"
 msgstr "基于线索的虚拟文件夹"
 
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "基于主题过滤(_J)"
 
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "基于发件人过滤(_D)"
 
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 msgid "Filter on Thread"
 msgstr "基于线索过滤"
 
-#: mail/em-folder-view.c:1652
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "默认"
+
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "打印消息"
 
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 msgid "_Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, c-format
 msgid "Click to mail %s"
 msgstr "点击以给 %s 发送邮件"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 msgid "Unsigned"
 msgstr "未签名"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "该邮件有数字签名，但不能证实是可信的。"
 
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "编辑签名"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "编辑签名"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 #, 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "被中断"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP 加密"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "证书 ID(_C)："
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "证书未生效"
 
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%H:%M"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "延误："
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%H:%M"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -12857,29 +12991,34 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 msgid "Formatting message"
 msgstr "正在移动邮件"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "发件人"
 
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "邮件程序"
 
@@ -12893,8 +13032,8 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "日期"
 
@@ -12912,21 +13051,26 @@ msgstr "无法解析 MIME 邮件。显示源文本。"
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 邮件。显示源文本。"
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "不支持的方案"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "无法校验叶子签名"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "无法校验叶子签名"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -12938,56 +13082,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "缓冲 %s 失败：%s"
 
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "缓冲 %s 失败：%s"
 
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "创建到“%s”的管道失败：%s"
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "解析主机“%s”：%s"
 
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "另存为..."
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
 msgstr "无标题图像.%s"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 msgid "_Reply to sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 msgid "Se_nd message to..."
 msgstr "把邮件发送到列表(_N)..."
 
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 msgid "_Add to Addressbook"
 msgstr "添加到地址簿(_A)"
 
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -13035,17 +13179,17 @@ msgstr "过滤规则"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的邮件 --------"
 
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "在%Y年%m月%d日的%H:%M，%%s写道："
 
-#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -13054,7 +13198,7 @@ msgstr ""
 "无法保存到“%s”\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -13063,30 +13207,36 @@ msgstr ""
 "%s 已经存在。\n"
 "您打算覆盖它吗？"
 
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 msgid "message"
 msgstr "邮件"
 
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "错误：“%s”不存在或者不是普通文件"
 
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 msgid "Save Message..."
 msgstr "保存邮件..."
 
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "地址"
 
-#: mail/em-utils.c:2085
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "来自 %s 的邮件"
+
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "无法创建临时目录：%s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13099,7 +13249,7 @@ msgstr ""
 "\n"
 "确实删除这些邮件吗？"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13125,317 +13275,325 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "邮件的默认主题。"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "邮件的默认主题。"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "在显示邮件的邮件体中搜索文本"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "在显示邮件的邮件体中搜索文本"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "转发方式(_F)："
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "邮件的默认主题。"
+
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "邮件的默认主题。"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "回复风格(_R)："
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "文件夹栏面板的默认宽度"
+
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "文件夹栏面板的默认宽度"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空已删除邮件(_T)"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出时清空已删除邮件(_T)"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "邮件账户"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "执行动作"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "新邮件提醒"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "新邮件提醒"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, 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:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "发送 HTML 邮件？"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "发送 HTML 邮件？"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "显示动画图像(_S)"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "显示动画图像(_S)"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "以普通样式显示邮件"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Show the \"Preview\" pane"
 msgstr "显示“预览”面板"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr "显示“预览”面板。"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "新邮件到达时播放声音文件(_P)"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "拼写检查(_C)"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "选择用于打印的 HTML 变宽度字体"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -13443,172 +13601,169 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "按线索编排的邮件列表"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "按线索编排的邮件列表"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "使它成为我的默认账户(_M)"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "变宽(_A)："
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "导入"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导入器"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Evolution Netscape 邮件导入器"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: 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_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: mail/importers/elm-importer.c:105
+#: 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/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution 正在导入您原来的电子邮件"
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "请稍候"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "正在按 %2$s 导入 %1$s"
-
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "正在扫描 %s"
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "正在导入文件"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -13616,16 +13771,44 @@ msgstr ""
 "Evolution 已经找到 Elm 邮件文件\n"
 "您希望将它们导入 Evolution 吗？"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "草稿文件夹(_F)："
+
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+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
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "正在导入"
+
+#: mail/importers/evolution-outlook-importer.c:271
+#: mail/importers/mail-importer.c:134
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "正在导入文件"
+
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "正在扫描 %s"
+
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "优先级过滤器“%s”"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13648,7 +13831,7 @@ msgstr ""
 "的过滤器也会用评分来替代优先级。请仔细检查导入的优先级，以确\n"
 "保过滤能够正常进行。"
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13659,7 +13842,7 @@ msgstr ""
 "或“观察线索”特性，而 Evolution 并不支持该\n"
 "特性。这些过滤器将被丢弃。"
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -13671,31 +13854,24 @@ msgstr ""
 "给定字符串，而 Evolution 并不支持该特性。这些过滤器\n"
 "将被修改为给定字符串是否包含于邮件体中。"
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "正在扫描过滤器"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "正在扫描目录"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "开始导入"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "设置"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "邮件过滤规则"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13703,11 +13879,20 @@ msgstr ""
 "Evolution 找到了 Netscape 邮件文件。\n"
 "您是否希望把它们导入 Evolution？"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution 正在导入您原来的 Pine 数据"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "正在导入文件"
+
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "地址簿"
+
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -13715,7 +13900,7 @@ msgstr ""
 "Evolution 找到 Pine 邮件文件。\n"
 "您是否原意把它们导入 Evolution？"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -13758,19 +13943,19 @@ msgid "You have not filled in all of the required information."
 msgstr "您还没有填写所有必须的信息。"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution 账户编辑器"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "主机(_H)："
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "用户名(_N)："
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "路径(_P)："
 
@@ -13822,28 +14007,43 @@ msgstr ""
 "   “%s”\n"
 "已经被更新。"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "新建邮件"
 
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "邮件(_M)"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "撰写一封新邮件"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "新建虚拟文件夹"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "邮件过滤规则"
+
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "创建新日历"
+
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "日历将显示的 URI"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "标识"
 
@@ -13884,7 +14084,7 @@ msgstr ""
 "请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "账户管理"
 
@@ -13908,120 +14108,116 @@ msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr "    "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "检查支持的类型(_C) "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr "<b>显示的邮件头(_D)</b>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "账户信息"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "添加脚本(_R)"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "添加新签名..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_W)"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "总是暗送到(_B)："
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "总是抄送到(_C)："
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "附加原始消息"
 
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "身份验证"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语(ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语(ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "字符集(_H)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "颜色(_O)"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "检查新邮件"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "在我输入时进行拼写检查(_T)"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "检查新邮件"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "给错误拼写的单词上色(_M)："
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "撰写邮件"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "配置"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14036,277 +14232,273 @@ msgstr ""
 "\n"
 "单击“应用”可保存您的设置。"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "默认(_F)"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "默认行为"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "默认字符编码(_E)："
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "删除邮件"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "对寄出的邮件进行数字签名(默认)(_S)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr "不检查 IMAP 账户收到的邮件(_N)"
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "无法引用原始消息"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
 
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "草稿文件夹(_F)："
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "电子邮件"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "电子邮件地址(_A)："
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "退出时清空已删除邮件(_T)"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 msgid "Encry_ption certificate:"
 msgstr "加密证书(_P)："
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "执行命令..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "固定宽度(_X)："
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Filter Options"
 msgstr "过滤选项"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "字体属性"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "用 HTML 格式化邮件(_H)"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "H_eaders"
 msgstr "信头(_E)"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "嵌入"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "标签和颜色"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "装入图像"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "邮件撰写器"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "邮件显示"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Message Fonts"
 msgstr "邮件字体"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "新邮件提醒"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：直到您第一次连接的时候，才会询问密码。"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "可选的信息"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "发送只有暗送收件人的邮件时提示(_O)"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "打印用字体"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "引用原始消息"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "引用"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "记住该密码(_M)"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "回复到(_P)："
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "接收选项(_O)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "记住此密码(_P)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "必需的信息"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "恢复默认值"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "安全(_E)"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "选择用于打印的 HTML 固定宽度字体"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "选择用于打印的 HTML 变宽度字体"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "已发送邮件文件夹(_M)："
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "服务器配置"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Si_gning certificate:"
 msgstr "签名证书(_G)："
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "指定文件名(_F)："
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "拼写检查(_C)"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "标准 Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14315,7 +14507,7 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -14323,7 +14515,7 @@ msgid ""
 msgstr ""
 "此页面允许您配置拼写检查行为和语言。在此列出的语言反映了您所安装的字典。"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14331,15 +14523,15 @@ msgstr ""
 "输入您想要给此帐户起的名字。\n"
 "如：“工作”或“私人”"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "变宽(_A)："
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14349,173 +14541,173 @@ msgstr ""
 "\n"
 "单击“前进”开始。"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "添加签名(_A)"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "总是离线装入图像(_A)"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "当使用该账户时总是发送签名邮件(_A)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "验证类型(_A)："
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "验证类型(_A)："
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail every"
 msgstr "自动检查邮件的间隔(_A)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "自动插入笑脸图像(_A)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "新邮件到达时鸣笛(_B)"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "当销毁文件夹时进行提示(_C)"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "默认签名(_D)："
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "默认(_D)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "新邮件到达时不要提醒我(_D)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "加密寄出的邮件(默认)(_E)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "全名(_F)："
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "HTML 邮件(_H)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "标识(_I)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "六月"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr "只进行本地测试(_L)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "使它成为我的默认账户(_M)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "把邮件标记为已读前等(_M)"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "从不离线装入图像(_N)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "新邮件到达时播放声音文件(_P)"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "发送空主题行的邮件时提示(_P)"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "接收邮件(_R)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "回复风格(_R)："
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "恢复默认值(_R)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "脚本(_S)："
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 msgid "_Select..."
 msgstr "选择(_S)..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "发送邮件(_S)"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "显示动画图像(_S)"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "签名(_S)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 msgid "_Standard Font:"
 msgstr "标准字体(_S)："
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 msgid "_Terminal Font:"
 msgstr "终端字体(_T)："
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全连接 (SSL)(_U)："
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "正在查验 %s"
@@ -14538,7 +14730,7 @@ msgstr ""
 "执行操作时错误：\n"
 "%s"
 
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "工作"
 
@@ -14550,12 +14742,12 @@ msgstr "过滤文件夹"
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14564,116 +14756,116 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "正在发送“%s”"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在第 %d 个邮件失败，共 %d 个"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "完成。"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
 
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "转发的邮件"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "正在销毁文件夹"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "正在清空“%s”中的已删除邮件"
 
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在收取邮件 %s"
 
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在收取 %d 封邮件"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 封邮件"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14682,7 +14874,7 @@ msgstr ""
 "无法创建输出文件：%s\n"
 " %s"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14691,11 +14883,11 @@ msgstr ""
 "在将邮件保存到 %s 时发生错误：\n"
 " %s"
 
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14704,22 +14896,22 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "正在断开与 %s 的连接"
 
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "正在重新连接到 %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -14751,38 +14943,38 @@ msgstr "加密"
 msgid "Security Information"
 msgstr "安全信息"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "正在取消..."
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "服务器：%s，类型：%s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路径：%s，类型：%s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "正在等待..."
 
@@ -14891,20 +15083,20 @@ msgstr ""
 "   “%s”\n"
 "已经被更新。"
 
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "虚拟文件夹"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "编辑虚拟文件夹"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
 
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "新建虚拟文件夹"
 
@@ -15223,97 +15415,20 @@ msgstr "离线文件夹"
 msgid "Autocompletion Folders"
 msgstr "自动完成文件夹"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "无法复制文件夹：%s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "无法移动文件夹：%s"
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "无法把文件夹移动到它本身。"
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "无法把文件夹复制到它本身。"
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "无法把文件夹移动到其子目录。"
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "复制文件夹"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "移动文件夹"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"无法删除文件夹：\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "您真的要删除文件夹“%s”吗？"
-
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"无法重命名文件夹：\n"
+"无法创建指定的文件夹：\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "指定的文件夹名称不合法：%s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "选中的文件夹不属于其它用户"
-
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"无法删除文件夹：\n"
-"%s"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"无法创建指定的文件夹：\n"
-"%s"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(无标题)"
@@ -15450,7 +15565,7 @@ msgstr "执行 gpg 失败。"
 msgid "_Import"
 msgstr "导入(_I)"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "正在关闭连接..."
 
@@ -15488,6 +15603,10 @@ msgstr "无法打开共享文件夹：%s。"
 msgid "Cannot find the specified shared folder."
 msgstr "无法找到指定的共享文件夹。"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "开始导入"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -15592,123 +15711,6 @@ msgstr "找不到配置数据库"
 msgid "Generic error"
 msgstr "通用错误"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "创建新快捷方式组"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "组名："
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "您真的希望从快捷方式栏上删除“%s”组吗？"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "重命名快捷方式组"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "把选中的快捷方式组重命名为："
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "小图标(_S)"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "用小图标显示快捷方式"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "大图标(_L)"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "用大图标显示快捷方式"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "添加组(_A)..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "创建新快捷方式组"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "删除该组(_R)..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "删除该快捷方式组"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "重命名该组(_N)..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "重命名该快捷方式组"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "隐藏快捷方式栏(_H)"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "隐藏快捷方式栏"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "创建默认快捷方式(_D)"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "创建默认快捷方式"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "重命名快捷方式"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "把快捷方式重命名为："
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "打开链接到此快捷方式的文件夹"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "在新窗口中打开(_W)"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "在新窗口中打开链接到此快捷方式的文件夹"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "重命名此快捷方式"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "删除(_M)"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "从快捷方式栏上删除此快捷方式"
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "保存快捷方式错误。"
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "快捷方式"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "复选框"
@@ -15719,11 +15721,6 @@ msgstr "复选框"
 msgid "New"
 msgstr "新建"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "“%2$s”中的“%1$s”"
-
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -16014,55 +16011,55 @@ msgstr ""
 "%s：不能同时使用 --online 和 --offline。\n"
 "  详情请使用 %s --help。\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 msgid "Select a cert to import..."
 msgstr "选择要导入的证书..."
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 msgid "Purposes"
 msgstr "用途"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "序列号"
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "表达式"
 
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 "证书过期：%s\n"
 "发行者：%s"
 
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "为 %s 输入密码"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -16129,7 +16126,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "证书"
 
@@ -16199,11 +16196,11 @@ msgstr "组织单元(OU)"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16249,227 +16246,227 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "您的证书"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "卡片 ID 已经存在"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 msgid "Version"
 msgstr "版本"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 msgid "Version 1"
 msgstr "版本 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 msgid "Version 2"
 msgstr "版本 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 msgid "Version 3"
 msgstr "版本 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "证书 ID(_C)："
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "证书 ID(_C)："
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "不信任的证书"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "主题是 %s"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "无法处理脱机文件夹"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "无效的证书颁发机构(CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "无效的证书颁发机构(CA)"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "没有信息"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "附件"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "证书 ID(_C)："
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "库里提巴"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "北卡罗莱纳州"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 msgid "Extensions"
 msgstr "扩展"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "证书签名算法"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 msgid "Issuer"
 msgstr "发行者"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "主题是 %s"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "证书签名失败"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "为 %s 输入密码"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "证书 ID(_C)："
@@ -17059,7 +17056,8 @@ msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -17067,7 +17065,8 @@ msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "将发件人添加到地址簿"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -17516,10 +17515,6 @@ msgstr "格式(_M)"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "打开"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "打开文件"
@@ -17883,22 +17878,6 @@ msgstr "发送/接收(_S)"
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "打印概要"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "打印概要"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "重新载入"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "重新载入视图"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "按公司(_C)"
@@ -17959,8 +17938,8 @@ msgstr "按类别(_C)"
 msgid "_Tasks"
 msgstr "任务(_T)"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -18206,23 +18185,23 @@ msgstr "搜索(_S)"
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "项目 ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "子项目 ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "文字"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "立即查找(_N)"
 
@@ -18236,6 +18215,208 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#~ msgid "Addressbook Sources"
+#~ msgstr "地址簿源"
+
+#~ msgid "No data provided"
+#~ msgstr "未提供数据"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法打开文件“%s”：\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法创建目录 %s：\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法创建文件“%s”：\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "“%s”不是目录"
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "正在按 %2$s 导入 %1$s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "正在扫描过滤器"
+
+#~ msgid "Scanning directory"
+#~ msgstr "正在扫描目录"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+#~ msgstr "不检查 IMAP 账户收到的邮件(_N)"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "无法复制文件夹：%s"
+
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "无法移动文件夹：%s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "无法把文件夹移动到它本身。"
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "无法把文件夹复制到它本身。"
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "无法把文件夹移动到其子目录。"
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
+
+#~ msgid "Copy Folder"
+#~ msgstr "复制文件夹"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
+
+#~ msgid "Move Folder"
+#~ msgstr "移动文件夹"
+
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法删除文件夹：\n"
+#~ "%s"
+
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "您真的要删除文件夹“%s”吗？"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法重命名文件夹：\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "选中的文件夹不属于其它用户"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法删除文件夹：\n"
+#~ "%s"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "创建新快捷方式组"
+
+#~ msgid "Group name:"
+#~ msgstr "组名："
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "您真的希望从快捷方式栏上删除“%s”组吗？"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "重命名快捷方式组"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "把选中的快捷方式组重命名为："
+
+#~ msgid "_Small Icons"
+#~ msgstr "小图标(_S)"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "用小图标显示快捷方式"
+
+#~ msgid "_Large Icons"
+#~ msgstr "大图标(_L)"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "用大图标显示快捷方式"
+
+#~ msgid "_Add Group..."
+#~ msgstr "添加组(_A)..."
+
+#~ msgid "Create a new shortcut group"
+#~ msgstr "创建新快捷方式组"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "删除该组(_R)..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "删除该快捷方式组"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "重命名该组(_N)..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "重命名该快捷方式组"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "隐藏快捷方式栏(_H)"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "隐藏快捷方式栏"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "创建默认快捷方式(_D)"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "创建默认快捷方式"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "重命名快捷方式"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "把快捷方式重命名为："
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "打开链接到此快捷方式的文件夹"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "在新窗口中打开(_W)"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "在新窗口中打开链接到此快捷方式的文件夹"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "重命名此快捷方式"
+
+#~ msgid "Re_move"
+#~ msgstr "删除(_M)"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "从快捷方式栏上删除此快捷方式"
+
+#~ msgid "Error saving shortcuts."
+#~ msgstr "保存快捷方式错误。"
+
+#~ msgid "Shortcuts"
+#~ msgstr "快捷方式"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "“%2$s”中的“%1$s”"
+
+#~ msgid "Print Summary"
+#~ msgstr "打印概要"
+
+#~ msgid "Print summary"
+#~ msgstr "打印概要"
+
+#~ msgid "Reload"
+#~ msgstr "重新载入"
+
+#~ msgid "Reload the view"
+#~ msgstr "重新载入视图"
+
 #~ msgid "Copy to folder..."
 #~ msgstr "复制到文件夹..."
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3c90b85d19..d56ce4bf21 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-02-09 15:17-0500\n"
+"POT-Creation-Date: 2004-03-05 13:00-0500\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"
@@ -58,8 +58,7 @@ msgstr "在此設定您的郵件帳號"
 #. 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:362 mail/importers/netscape-importer.c:1844
-#: shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:363
 msgid "Contacts"
 msgstr "連絡人"
 
@@ -113,16 +112,16 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
-msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
 # importers/pine-importer.c:661
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/addressbook-component.c:308
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid "New Addressbook"
+msgid "New Address Book"
 msgstr "目錄服務"
 
 # addressbook/gui/component/addressbook-config.glade.h:3
@@ -136,9 +135,9 @@ msgstr "目錄服務"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/component/addressbook-component.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -150,79 +149,79 @@ msgstr "刪除"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: addressbook/gui/component/addressbook-component.c:272
-#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "屬性..."
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:554
 #, fuzzy
 msgid "New Contact"
 msgstr "新的連絡人:"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
 # ui/evolution-addressbook.xml.h:2
-#: addressbook/gui/component/addressbook-component.c:345
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:562
 #, fuzzy
 msgid "Contact _List"
 msgstr "新增連絡人清單"
 
 # ui/evolution-addressbook.xml.h:2
-#: addressbook/gui/component/addressbook-component.c:352
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "無法連線至 LDAP 伺服器"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "無法驗證進入 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr "無法在 Root DSE 上執行查詢"
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr "伺服器回報了不支援的搜尋起點"
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
 msgstr "接收模式資訊時發生錯誤"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 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:57
-#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 #, fuzzy
 msgid "Migrating..."
 msgstr "正在等待..."
@@ -237,45 +236,47 @@ msgstr ""
 
 # mail/mail-ops.c:599
 #: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinging %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:406
-#: calendar/gui/migration.c:425 calendar/gui/migration.c:502
+#: addressbook/gui/component/addressbook-migrate.c:409
+#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
+#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
+#: mail/mail-component.c:201
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:414
-#: calendar/gui/migration.c:433 calendar/gui/migration.c:510
+#: addressbook/gui/component/addressbook-migrate.c:417
+#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:422
+#: addressbook/gui/component/addressbook-migrate.c:425
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: addressbook/gui/component/addressbook-migrate.c:550
+#: addressbook/gui/component/addressbook-migrate.c:553
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-#: addressbook/gui/component/addressbook-migrate.c:670
+#: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "自動補齊資料夾"
 
-#: addressbook/gui/component/addressbook.c:273
+#: addressbook/gui/component/addressbook.c:275
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -287,7 +288,7 @@ msgstr ""
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
-#: addressbook/gui/component/addressbook.c:279
+#: addressbook/gui/component/addressbook.c:281
 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"
@@ -299,20 +300,20 @@ msgstr ""
 "或是提高此目錄服務的目錄伺服器偏好設定中的\n"
 "結果上限。"
 
-#: addressbook/gui/component/addressbook.c:285
+#: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄服務的後端程式無法解析這次的查詢。"
 
-#: addressbook/gui/component/addressbook.c:288
+#: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 
-#: addressbook/gui/component/addressbook.c:291
+#: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
 # addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:594
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -322,7 +323,7 @@ msgstr ""
 "您是否擁有存取權限。"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -333,7 +334,7 @@ msgstr ""
 "或者 LDAP 伺服器沒有啟動。"
 
 # addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:606
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -345,7 +346,7 @@ msgstr ""
 "及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:615
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -356,30 +357,36 @@ msgstr ""
 "或者伺服器沒有啟動。"
 
 # addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/component/addressbook.c:630
+#: addressbook/gui/component/addressbook.c:632
 msgid "Unable to open addressbook"
 msgstr "無法開啟目錄服務"
 
-#: addressbook/gui/component/addressbook.c:714
+#: addressbook/gui/component/addressbook.c:716
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:789
+#: addressbook/gui/component/addressbook.c:791
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 
 # calendar/gui/control-factory.c:126
-#: addressbook/gui/component/addressbook.c:1071
+#: addressbook/gui/component/addressbook.c:1116
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "行事曆將顯示的 URI "
 
+# calendar/gui/control-factory.c:126
+#: addressbook/gui/component/addressbook.c:1121
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "行事曆將顯示的 URI "
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -424,7 +431,7 @@ msgstr " 顯示支援的起點(_S) "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: 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
@@ -459,22 +466,23 @@ msgstr "636"
 # mail/mail-config.glade.h:40
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Addressbook Creation Assistant"
+msgid "Address Book Creation Assistant"
 msgstr "LDAP 組態助理"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
 #: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
-msgid "Addressbook Properties"
+msgid "Address Book Properties"
 msgstr "目錄服務來源"
 
-# addressbook/gui/component/addressbook-config.glade.h:2
+# ui/evolution-addressbook.xml.h:16
 #: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Addressbook Sources"
-msgstr "目錄服務來源"
+#, fuzzy
+msgid "Address Book Sources"
+msgstr "目錄服務來源..."
 
 #: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "永遠"
 
@@ -486,7 +494,8 @@ msgstr "匿名"
 #: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
+"Congratulations, you are\n"
+"\t      finished setting up this address book.\n"
 "\n"
 "Please click the \"Apply\" button to save the settings you have entered here."
 msgstr ""
@@ -496,38 +505,38 @@ msgstr ""
 "請按“完成”按鈕以儲存您在這裡輸入的設定值。"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Connecting"
 msgstr "連線中"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Distinguished _name:"
 msgstr "'辨別的名稱(_N):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution 會使用這個 DN 透過伺服器來驗證您"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 會使用電子郵件位址透過伺服器來驗證您"
 
 # mail/mail-search.c:316
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 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:25
+#: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
@@ -535,19 +544,19 @@ msgid "General"
 msgstr "一般"
 
 # shell/e-shortcuts-view.c:137
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "組別"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "永不"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -561,26 +570,26 @@ msgstr ""
 "您的連線。請向您的系統管理者詢問您的 LDAP 伺服器是否使用這些通訊協定。"
 
 # addressbook/gui/component/addressbook-config.c:179
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "一層"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "S_earch scope: "
 msgstr "搜尋範圍(_E):"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Searching"
 msgstr "搜尋中"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Selected:"
 msgstr "已選擇:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -589,7 +598,7 @@ msgstr ""
 "選擇這個選項代表 Evolution 只有在您的 LDAP 伺服器支援 SSL 或 TLS 時\n"
 "才會連線到您的 LDAP 伺服器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -605,7 +614,7 @@ msgstr ""
 "那麼 Evolution 就不需要使用 SSL/TLS，因為您的連線已經\n"
 "很安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -617,7 +626,7 @@ msgstr ""
 "表示您的連線將是不安全的，同時您在安全性上是有\n"
 "弱點的。"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:46
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
@@ -627,46 +636,47 @@ msgstr ""
 "選擇這個選項會讓您改變 Evolution 在 LDAP 搜尋、建立\n"
 "和編輯連絡人的預設設定。"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid ""
-"Specifying a display name and group is the first step in setting up an "
-"addressbook."
+"Specifying a\n"
+"\t\t\t  display name and group is the first step in setting\n"
+"\t\t\t  up an address book."
 msgstr "指定顯示名稱是在設定 LDAP 伺服器時最後需要的步驟。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "Step 2: Server Information"
 msgstr "步驟一：伺服器資訊"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Step 3: Connecting to Server"
 msgstr "步驟二：連線至伺服器"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "Step 4: Searching the Directory"
 msgstr "步驟三：搜尋目錄"
 
 # calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:55
 msgid "Sub"
 msgstr "子目錄"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -678,7 +688,7 @@ msgstr ""
 "還有一次搜尋應該花多久的時間。如果您需要改變這些選項，\n"
 "請詢問您的系統管理者。"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -688,7 +698,7 @@ msgstr ""
 "搜尋起點是您的搜尋起始處的辨認的名稱 (DN)。\n"
 "如果您讓它保持空白，搜尋會從樹狀目錄的根目錄開始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -701,12 +711,13 @@ msgstr ""
 "“子目錄”的搜尋範圍會包括在您的搜尋起點之下的所有項目。\n"
 "“一層”的搜尋範圍只會包括在您的起點下一層的項目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:66
 #, fuzzy
 msgid ""
-"This assistant will help you create a new addressbook. \n"
+"This assistant will help you\n"
+"\t      create a new address book. \n"
 "\n"
-"Depending on the type of addressbook you create, additional\n"
+"Depending on the type of address book you create, additional\n"
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
@@ -717,22 +728,23 @@ msgstr ""
 "的特殊資訊。如果您需要找尋這個資訊，請連絡\n"
 "您的系統管理者。"
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:69
+#: addressbook/gui/component/ldap-config.glade.h:73
+#, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
-"too large will slow down your addressbook."
+"too large will slow down your address book."
 msgstr ""
 "這是要下載的項目的最大數量。把這個數量設得\n"
 "太大會減慢您的目錄服務的速度。"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -741,7 +753,7 @@ msgstr ""
 "這是 Evolution 將要用驗證您的方法。注意要設定此項至“電子郵件位址”需要您的 "
 "LDAP 伺服器的匿名存取。"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -750,7 +762,7 @@ msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
@@ -760,7 +772,7 @@ msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -771,29 +783,29 @@ msgstr ""
 "這裡提供了標準連接埠的清單。請詢問您的系統管理者\n"
 "您應該指定哪個連接埠。"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "This option controls how long a search will be run."
 msgstr "這個選項控制搜尋會執行多久的時間。"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "U_se SSL/TLS:"
 msgstr "使用 SSL/TLS(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "Using email address"
 msgstr "使用電子郵件位址"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
@@ -806,12 +818,12 @@ msgstr ""
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "顯示名稱(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
@@ -821,10 +833,10 @@ msgstr "下載限制(_D):"
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 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
@@ -833,27 +845,27 @@ msgstr "下載限制(_D):"
 msgid "_Edit"
 msgstr "編輯 (_E)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Log in method:"
 msgstr "登入方法(_L):"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "_Port number:"
 msgstr "連接埠號碼(_P):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "_Search base:"
 msgstr "搜尋起點(_S):"
 
 # calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "_Server name:"
 msgstr "伺服器名稱(_S):"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "_Timeout (minutes):"
 msgstr "逾時時間（分鐘）(_T):"
 
@@ -861,24 +873,24 @@ msgstr "逾時時間（分鐘）(_T):"
 # 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:93
+#: addressbook/gui/component/ldap-config.glade.h:97
 msgid "cards"
 msgstr "名片"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:98
 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:95
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
 msgstr "general-tab"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -1037,7 +1049,7 @@ msgstr "合作"
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2020
+#: addressbook/gui/contact-editor/e-contact-editor.c:2061
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1165,10 +1177,10 @@ msgstr "類別(_T)..."
 # ui/evolution.xml.h:46
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111
-#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
+#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:19
@@ -1231,8 +1243,8 @@ msgstr "Web 網址(_W):"
 
 # addressbook/backend/ebook/e-card.c:3346
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:251
+#: addressbook/gui/widgets/eab-contact-display.c:267
 msgid "Address"
 msgstr "地址"
 
@@ -1240,8 +1252,8 @@ msgstr "地址"
 # mail/mail-config.glade.h:30
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:244
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -2333,85 +2345,93 @@ msgstr "辛巴威"
 msgid "AOL Instant Messenger"
 msgstr "張貼郵件(_P)"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:2844
+msgid "Novell Groupwise"
+msgstr ""
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:2908
 #: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:260
 #, fuzzy
 msgid "Jabber"
 msgstr "未命名的清單"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr ""
 
 # ui/evolution-mail.xml.h:109
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "郵件訊息(_M)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:2847
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: addressbook/gui/widgets/eab-contact-display.c:244
+#: addressbook/gui/widgets/eab-contact-display.c:259
 msgid "ICQ"
 msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
-#: addressbook/gui/contact-editor/e-contact-editor.c:711
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 #, fuzzy
 msgid "Service"
 msgstr "服務已就緒"
 
 # addressbook/backend/ebook/e-card.c:3442
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: addressbook/gui/contact-editor/e-contact-editor.c:758
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
 msgid "Location"
 msgstr "位置:"
 
 # mail/mail-config.glade.h:80
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #, fuzzy
 msgid "Username"
 msgstr "使用者名稱(_N):"
 
 # addressbook/contact-editor/e-contact-editor.c:1249
 # addressbook/contact-editor/e-contact-editor.c:1311
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
-#: addressbook/gui/contact-editor/e-contact-editor.c:2534
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:2575
+#: addressbook/gui/contact-editor/e-contact-editor.c:2872
 msgid "Home"
 msgstr "住家電話"
 
 #. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:2876
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "工作"
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
-#: addressbook/gui/contact-editor/e-contact-editor.c:2535
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:2576
+#: addressbook/gui/contact-editor/e-contact-editor.c:2880
 msgid "Other"
 msgstr "其它"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/contact-editor/e-contact-editor.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:209
 #, fuzzy
 msgid "Source Book"
 msgstr "來源"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:216
 msgid "Target Book"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:223
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -2419,33 +2439,33 @@ msgid "Contact"
 msgstr "連絡人"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
+#: addressbook/gui/contact-editor/e-contact-editor.c:230
 #, fuzzy
 msgid "Is New Contact"
 msgstr "新增連絡人"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:250
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Changed"
 msgstr "已變更"
 
 # mail/mail-config.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor.c:725
+#: addressbook/gui/contact-editor/e-contact-editor.c:749
 msgid "Account Name"
 msgstr "帳號名稱"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 msgid "Category editor not available."
 msgstr "類別編輯器無法使用。"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:1462
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "This contact belongs to these categories:"
 msgstr "此連絡人屬於這些類別:"
 
@@ -2453,13 +2473,13 @@ msgstr "此連絡人屬於這些類別:"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-editor/e-contact-editor.c:1685
+#: addressbook/gui/contact-editor/e-contact-editor.c:1725
 msgid "Save Contact as VCard"
 msgstr "儲存成 VCard 檔案格式"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2469,7 +2489,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2479,54 +2499,60 @@ msgstr ""
 
 # addressbook/contact-editor/e-contact-editor.c:1243
 # addressbook/contact-editor/e-contact-editor.c:1310
-#: addressbook/gui/contact-editor/e-contact-editor.c:2533
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 msgid "Business"
 msgstr "商務電話"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2843
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 #: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:256
+#: addressbook/gui/widgets/eab-contact-display.c:257
 msgid "AIM"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2845
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:2909
+#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:262
 #, fuzzy
 msgid "Yahoo"
 msgstr "約羅"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2846
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: addressbook/gui/widgets/eab-contact-display.c:246
+#: addressbook/gui/widgets/eab-contact-display.c:261
 msgid "MSN"
 msgstr ""
 
+# shell/e-shortcuts-view.c:137
+#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#, fuzzy
+msgid "GroupWise"
+msgstr "組別"
+
 # camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:3134
+#: addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "無法找到此欄位之界面工具：“%s”"
 
 # addressbook/contact-editor/e-contact-quick-add.c:233
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "快速新增連絡人"
 
 # addressbook/contact-editor/e-contact-quick-add.c:235
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 #, fuzzy
 msgid "_Edit Full"
 msgstr "編輯全部"
 
 # mail/mail-config.glade.h:31
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
 #, fuzzy
 msgid "_Full Name:"
 msgstr "全名(_F):"
 
 # addressbook/contact-editor/e-contact-quick-add.c:282
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 #, fuzzy
 msgid "E-_mail:"
 msgstr "電子郵件"
@@ -2726,7 +2752,7 @@ msgstr "是新的清單"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
@@ -2734,7 +2760,7 @@ msgstr "連絡人清單編輯器"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
 msgid "Save List as VCard"
 msgstr "儲存清單為 VCard 檔案格式"
 
@@ -2836,7 +2862,7 @@ msgstr "電子郵件開始於"
 
 # calendar/gui/e-calendar-table.c:150
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "類別為"
 
@@ -2844,7 +2870,7 @@ msgstr "類別為"
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
@@ -2865,66 +2891,67 @@ msgstr "類型"
 
 # importers/pine-importer.c:661
 #: addressbook/gui/widgets/e-addressbook-view.c:494
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
 msgstr "目錄服務"
 
 # 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/e-addressbook-view.c:835
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
-#: addressbook/gui/widgets/e-addressbook-view.c:2013
+#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:2016
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "儲存成 VCard 檔案格式"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:1042
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 msgid "New Contact..."
 msgstr "新增連絡人..."
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/widgets/e-addressbook-view.c:1043
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
 msgid "New Contact List..."
 msgstr "新增連絡人清單..."
 
 # ui/evolution.xml.h:52
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "Go to Folder..."
 msgstr "移至資料夾..."
 
 # shell/e-shell-importer.c:363
-#: addressbook/gui/widgets/e-addressbook-view.c:1047
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
 msgid "Import..."
 msgstr "匯入..."
 
 # ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Search for Contacts..."
 msgstr "尋找連絡人..."
 
 # ui/evolution-addressbook.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "目錄服務來源..."
 
 # ui/evolution-mail.xml.h:110
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Pilot Settings..."
 msgstr "Pilot 設定..."
 
 # ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:1056
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "轉寄連絡人"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "Send Message to Contact"
 msgstr "傳送郵件給連絡人"
 
@@ -2935,34 +2962,33 @@ msgstr "傳送郵件給連絡人"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475
+#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
-#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "列印"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
 # addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Print Envelope"
 msgstr "列印信封"
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "目錄服務..."
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1068
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "目錄服務..."
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪下"
@@ -2971,28 +2997,28 @@ msgstr "剪下"
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-#: calendar/gui/calendar-component.c:358
-#: calendar/gui/dialogs/copy-source-dialog.c:158
-#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: calendar/gui/calendar-component.c:372
+#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: 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 "複製"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "貼上"
 
 # widgets/menus/gal-view-menus.c:176
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-#: calendar/gui/e-cal-view.c:1224
+#: addressbook/gui/widgets/e-addressbook-view.c:1078
+#: calendar/gui/e-cal-view.c:1269
 msgid "Current View"
 msgstr "目前檢視"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1264
+#: addressbook/gui/widgets/e-addressbook-view.c:1267
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3005,8 +3031,8 @@ msgstr ""
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1604
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "任何類別"
 
@@ -3061,7 +3087,7 @@ 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:438 smime/lib/e-cert.c:769
+#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "電子郵件"
 
@@ -3141,7 +3167,7 @@ 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:270
+#: addressbook/gui/widgets/eab-contact-display.c:273
 msgid "Note"
 msgstr "備註"
 
@@ -3152,7 +3178,7 @@ 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:239
+#: addressbook/gui/widgets/eab-contact-display.c:240
 msgid "Organization"
 msgstr "團體"
 
@@ -3305,75 +3331,82 @@ msgstr "已選擇"
 msgid "Has Cursor"
 msgstr "有游標"
 
-#: addressbook/gui/widgets/eab-contact-display.c:116
+#: addressbook/gui/widgets/eab-contact-display.c:117
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:126
+#: addressbook/gui/widgets/eab-contact-display.c:127
 msgid "map"
 msgstr ""
 
 # calendar/gui/goto-dialog.glade.h:12
-#: addressbook/gui/widgets/eab-contact-display.c:176
-#: addressbook/gui/widgets/eab-contact-display.c:414
+#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:423
 #, fuzzy
 msgid "List Members"
 msgstr "會員"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:232
+#: addressbook/gui/widgets/eab-contact-display.c:233
 #, fuzzy
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: addressbook/gui/widgets/eab-contact-display.c:237
+#: addressbook/gui/widgets/eab-contact-display.c:238
 #, fuzzy
 msgid "work"
 msgstr "工作"
 
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:241
 #, fuzzy
 msgid "Position"
 msgstr "波士頓"
 
-#: addressbook/gui/widgets/eab-contact-display.c:246
+# shell/e-shortcuts-view.c:137
+#: addressbook/gui/widgets/eab-contact-display.c:243
+#: addressbook/gui/widgets/eab-contact-display.c:258
+#, fuzzy
+msgid "Groupwise"
+msgstr "組別"
+
+#: addressbook/gui/widgets/eab-contact-display.c:248
 msgid "Video Conferencing"
 msgstr ""
 
 # mail/mail-config.glade.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:247
+#: addressbook/gui/widgets/eab-contact-display.c:249
 #, fuzzy
 msgid "Phone"
 msgstr "朋榭"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:250
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:253
+#: addressbook/gui/widgets/eab-contact-display.c:255
 #, fuzzy
 msgid "personal"
 msgstr "個人"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:264
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#: addressbook/gui/widgets/eab-contact-display.c:473
+#: addressbook/gui/widgets/eab-contact-display.c:265
+#: addressbook/gui/widgets/eab-contact-display.c:482
 #, fuzzy
 msgid "Blog"
 msgstr "波隆納"
 
 # addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:434
+#: addressbook/gui/widgets/eab-contact-display.c:443
 #, 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:465
+#: addressbook/gui/widgets/eab-contact-display.c:474
 #, fuzzy
 msgid "Home page"
 msgstr "住家傳真"
@@ -3385,8 +3418,8 @@ msgstr "成功"
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
+#: 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:1071
 msgid "Unknown error"
@@ -3429,7 +3462,7 @@ msgstr "通訊協定不支援"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2344 camel/camel-service.c:728
+#: calendar/gui/print.c:2350 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
@@ -3455,7 +3488,8 @@ msgstr "TLS 無法使用"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Addressbook does not exist"
+#, fuzzy
+msgid "Address Book does not exist"
 msgstr "目錄服務不存在"
 
 # shell/e-storage.c:467
@@ -3628,7 +3662,8 @@ msgstr "新增住址到既存之連絡人 “%s”"
 
 # addressbook/gui/widgets/e-minicard-control.c:282
 #: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "查詢目錄服務..."
 
 # addressbook/gui/component/e-address-widget.c:388
@@ -3698,6 +3733,32 @@ msgstr ""
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution 郵件編輯器。"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution 郵件編輯器。"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+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
@@ -3706,14 +3767,14 @@ msgid "Print envelope"
 msgstr "列印信封"
 
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/printing/e-contact-print.c:1008
+#: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
 msgstr "列印選定的連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/printing/e-contact-print.c:1074
-#: addressbook/printing/e-contact-print.c:1101
+#: addressbook/printing/e-contact-print.c:1075
+#: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
 msgstr "列印選定的連絡人"
@@ -3830,7 +3891,7 @@ msgid "Number of columns:"
 msgstr "欄數:"
 
 # addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "選項"
 
@@ -4051,8 +4112,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:34 calendar/gui/itip-utils.c:1156
-#: smime/gui/component.c:39
+#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: smime/gui/component.c:44
 #, fuzzy
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -4166,10 +4227,9 @@ msgstr "Evolution 測試元件。"
 # 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:1101 calendar/gui/print.c:1820
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80
-#: calendar/importers/icalendar-importer.c:710
-#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
 msgstr "工作"
 
@@ -4232,28 +4292,29 @@ msgstr "延遲時間（分鐘）"
 msgid "_Edit appointment"
 msgstr "編輯約會(_E)"
 
-# mail/folder-browser.c:686
-#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037
-#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "開啟(_O)"
+# 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:903
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "開啟"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:901
-msgid "_Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:905
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
-msgid "Dismiss _All"
+#: calendar/gui/alarm-notify/alarm-queue.c:907
+msgid "Dismiss All"
 msgstr ""
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:968
+#: calendar/gui/alarm-notify/alarm-queue.c:972
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:986
+#: calendar/gui/alarm-notify/alarm-queue.c:990
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4263,12 +4324,12 @@ msgid ""
 msgstr ""
 
 # widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
-#: calendar/gui/alarm-notify/alarm-queue.c:1102
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1106
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
+#: calendar/gui/alarm-notify/alarm-queue.c:1086
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4280,7 +4341,7 @@ msgstr ""
 "送出電子邸件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4300,7 +4361,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -4314,7 +4375,7 @@ 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:160
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
@@ -4328,12 +4389,12 @@ msgstr "無法初始化 Bonobo"
 # 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:163
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not initialize gnome-vfs"
 msgstr "無法始初化 gnome-vfs"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
@@ -4486,28 +4547,35 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 # calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "主旨包含"
 
 # calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "描述包含"
 
 # calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "備註包含"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "描述包含"
+
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
 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:1597
-#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "行事曆"
 
@@ -4546,7 +4614,7 @@ 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:692
-#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4573,13 +4641,13 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, 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:356
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
@@ -4587,83 +4655,83 @@ msgstr "新喀里多尼亞島"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:601
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "新增約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/calendar-component.c:602
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "約會(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:608
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "新增會議"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:609
+#: calendar/gui/calendar-component.c:851
 #, fuzzy
 msgid "M_eeting"
 msgstr "會議"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:852
 #, 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:615
+#: calendar/gui/calendar-component.c:857
 #, 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:616
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "全天約會(_D)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:859
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "建立一個新的約會"
 
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:864
 #, 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:623
+#: calendar/gui/calendar-component.c:865
 #, fuzzy
 msgid "C_alendar"
 msgstr "行事曆(_A):"
 
 # ui/evolution.xml.h:10
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:866
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "新增一個資料夾"
 
-#: calendar/gui/calendar-component.c:691
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:703
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
@@ -4824,7 +4892,7 @@ msgstr "時"
 msgid "minutes"
 msgstr "分"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4922,7 +4990,7 @@ msgstr "時"
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "分"
 
@@ -4936,7 +5004,7 @@ 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -4999,7 +5067,7 @@ msgstr "30 分"
 msgid "60 minutes"
 msgstr "60 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr "警報"
 
@@ -5028,7 +5096,7 @@ msgstr "天"
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "啟用(_E)"
 
@@ -5208,7 +5276,7 @@ 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
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "一般(_G)"
 
@@ -5327,7 +5395,7 @@ msgstr ""
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "工作清單"
@@ -5509,7 +5577,7 @@ msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
 msgid " to "
 msgstr " 到 "
 
@@ -5517,7 +5585,7 @@ msgstr " 到 "
 # 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:2257
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
 msgid " (Completed "
 msgstr " (已完成) "
 
@@ -5525,17 +5593,17 @@ msgstr " (已完成) "
 # 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:2259
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
 msgid "Completed "
 msgstr "已完成 "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
 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:2266
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
 msgid "Due "
 msgstr "期限 "
 
@@ -5579,8 +5647,8 @@ msgid "No summary"
 msgstr "沒有摘要"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "另存新檔..."
 
@@ -5613,11 +5681,26 @@ msgid "Destination is read only"
 msgstr ""
 
 # shell/e-shell-importer.c:602
-#: calendar/gui/dialogs/copy-source-dialog.c:164
-#, fuzzy
-msgid "Select destination source"
+#: calendar/gui/dialogs/copy-source-dialog.c:165
+#, fuzzy, c-format
+msgid "Select destination %s"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "calendar"
+msgstr "行事曆"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/copy-source-dialog.c:167
+#, fuzzy
+msgid "task list"
+msgstr "工作清單"
+
 # calendar/gui/dialogs/delete-comp.c:84
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -5739,7 +5822,7 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
 msgid "Appointment"
 msgstr "約會"
 
@@ -5768,26 +5851,34 @@ msgstr "會議排程"
 msgid "Meeting"
 msgstr "會議"
 
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
+msgstr ""
+
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510
+#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
 # shell/e-storage.c:475
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "權限不足"
@@ -5908,31 +5999,31 @@ 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:591 composer/e-msg-composer.c:2086
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
 #: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: mail/mail-config.glade.h:80
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "無"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -6179,7 +6270,7 @@ msgstr "出現"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:7
 # calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 #, fuzzy
 msgid "Date/Time"
 msgstr "日期/時間:"
@@ -6227,7 +6318,7 @@ msgstr "非週期性約會(_N)"
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -6278,7 +6369,7 @@ msgstr ""
 "\n"
 "您是否要儲存變更？"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
@@ -6308,7 +6399,7 @@ msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 # 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/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
@@ -6326,7 +6417,7 @@ msgstr "% 完成"
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2347
 msgid "Completed"
 msgstr "已完成"
 
@@ -6348,7 +6439,7 @@ msgstr "高"
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
 msgid "In Progress"
 msgstr "進行中"
 
@@ -6382,7 +6473,7 @@ msgstr "普通"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2335
+#: calendar/gui/print.c:2341
 msgid "Not Started"
 msgstr "未開始"
 
@@ -6436,17 +6527,17 @@ msgstr "基本"
 msgid "Assignment"
 msgstr "指派工作"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr ""
 
 # addressbook/gui/component/addressbook.c:438
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法開啟目錄服務"
@@ -6463,7 +6554,7 @@ msgstr "機密(_F)"
 # composer/e-msg-composer-attachment.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "描述:"
 
@@ -6709,12 +6800,11 @@ msgstr "開始日期"
 # calendar/gui/e-calendar-table.c:159
 #: calendar/gui/e-cal-list-view.etspec.h:5
 #: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
-#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "摘要"
 
 # mail/mail-config.glade.h:2
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "顏色"
 
@@ -6746,7 +6836,7 @@ msgid "S"
 msgstr "S"
 
 # calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
@@ -6789,10 +6879,10 @@ msgstr "否"
 #: 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:1664 camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
 #: 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:2094
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "不明"
@@ -6808,53 +6898,53 @@ msgid "Assigned"
 msgstr "已指定"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
+#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861
+#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "更新物件"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298
+#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
 msgid "New Task"
 msgstr "新增工作"
 
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "列印(_P)..."
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246
-#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
@@ -6862,36 +6952,43 @@ msgid "_Paste"
 msgstr "貼上(_P)"
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "移至今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
+# mail/folder-browser.c:686
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
+#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "開啟(_O)"
+
 # mail/folder-browser.c:690
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774
+#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
@@ -6900,38 +6997,38 @@ msgstr "剪下(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-cal-view.c:1245 calendar/gui/e-cal-view.c:1282
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1295
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1296
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 # ui/evolution-mail.xml.h:110
-#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33
+#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "設定值(_S)..."
 
@@ -7042,7 +7139,7 @@ msgstr "提醒"
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "完成"
 
@@ -7119,7 +7216,7 @@ msgstr "間隔 %02i 分鐘"
 # 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:688 calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -7129,7 +7226,7 @@ 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:696 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
@@ -7138,7 +7235,7 @@ msgstr "%d %b"
 # 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:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "上午"
@@ -7147,7 +7244,7 @@ msgstr "上午"
 # 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:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "下午"
@@ -7361,7 +7458,7 @@ msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
 #: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -7892,13 +7989,13 @@ msgid "Web Page:"
 msgstr "頁"
 
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "請按這裡增加新的工作"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907
+#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7908,7 +8005,7 @@ msgstr ""
 " %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928
+#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -7917,13 +8014,13 @@ msgid ""
 msgstr ""
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:889
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -7933,33 +8030,46 @@ msgstr ""
 " %s"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:908
 #, fuzzy
 msgid "Loading tasks"
 msgstr "載入影像"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1010
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1033
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1058
 msgid "Expunging"
 msgstr "除去中"
 
+# ui/evolution-mail.xml.h:46
+#: calendar/gui/gnome-cal.c:1751
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "載入影像"
+
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/gnome-cal.c:1763
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "無約會"
+
 # mail/mail-display.c:299
-#: calendar/gui/gnome-cal.c:1787
+#: calendar/gui/gnome-cal.c:1796
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "在 %s 內開啟..."
 
-#: calendar/gui/gnome-cal.c:1936
+#: calendar/gui/gnome-cal.c:1945
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -8106,17 +8216,17 @@ msgstr "空閒/忙碌資訊 (%s 到 %s)"
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: calendar/gui/itip-utils.c:671
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
 # camel/camel-smime-context.c:194
-#: calendar/gui/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-#: calendar/gui/migration.c:136
+#: calendar/gui/migration.c:137
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8124,7 +8234,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:140
+#: calendar/gui/migration.c:141
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8132,12 +8242,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:365
+#: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:441
+#: calendar/gui/migration.c:442
 msgid "On The Web"
 msgstr ""
 
@@ -8378,42 +8488,42 @@ msgstr "選擇的年(%Y)"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/print.c:2292
+#: calendar/gui/print.c:2298
 msgid "Task"
 msgstr "工作"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/print.c:2351
+#: calendar/gui/print.c:2357
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2374
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2386
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/print.c:2392
+#: calendar/gui/print.c:2398
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
 # addressbook/backend/ebook/e-card.c:3467
-#: calendar/gui/print.c:2406
+#: calendar/gui/print.c:2412
 #, c-format
 msgid "Categories: %s"
 msgstr "類別: %s"
 
 # ui/evolution-addressbook.xml.h:17
-#: calendar/gui/print.c:2417
+#: calendar/gui/print.c:2423
 msgid "Contacts: "
 msgstr "連絡人: "
 
@@ -8421,21 +8531,21 @@ msgstr "連絡人: "
 # mail/mail-callbacks.c:1447
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
-#: calendar/gui/print.c:2554 calendar/gui/print.c:2640
-#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
+#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "預覽列印"
 
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: calendar/gui/print.c:2588
+#: calendar/gui/print.c:2594
 msgid "Print Item"
 msgstr "列印項目"
 
 # ui/evolution-event-editor.xml.h:36
 # ui/evolution-task-editor-dialog.xml.h:39
-#: calendar/gui/print.c:2754
+#: calendar/gui/print.c:2760
 msgid "Print Setup"
 msgstr "列印設定"
 
@@ -8445,24 +8555,24 @@ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:556
+#: calendar/gui/tasks-component.c:558
 msgid "New task"
 msgstr "新增工作"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/tasks-component.c:557
+#: calendar/gui/tasks-component.c:559
 msgid "_Task"
 msgstr "工作(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:563
+#: calendar/gui/tasks-component.c:565
 #, fuzzy
 msgid "New task list"
 msgstr "工作清單"
@@ -8470,23 +8580,23 @@ msgstr "工作清單"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:564
+#: calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "_Task List"
 msgstr "工作清單"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
 #, fuzzy
 msgid "Create a new task list"
 msgstr "建立一個新的工作"
 
-#: calendar/gui/tasks-component.c:632
+#: calendar/gui/tasks-component.c:634
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:644
+#: calendar/gui/tasks-component.c:646
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -8559,23 +8669,23 @@ msgstr "行事曆訊息"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:78
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "公開資料夾包含約會與事件"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/importers/icalendar-importer.c:495
+#: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "提醒！！"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
 # importers/pine-importer.c:705
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -8585,7 +8695,7 @@ msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
@@ -10307,7 +10417,7 @@ msgstr "在第 %d 封郵件發生錯誤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
@@ -10413,7 +10523,7 @@ msgstr "複製郵件"
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
-#: camel/camel-gpg-context.c:709
+#: camel/camel-gpg-context.c:710
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -10424,15 +10534,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:723
+#: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: camel/camel-gpg-context.c:747
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg passphrase 要求時失敗。"
 
-#: camel/camel-gpg-context.c:761
+#: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -10442,35 +10552,30 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
-#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579
+#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:796
+#: camel/camel-gpg-context.c:797
 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:802
+#: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
-# camel/camel-pgp-context.c:1073
-#: camel/camel-gpg-context.c:814
-msgid "No data provided"
-msgstr "沒有提供資料"
-
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:852
+#: camel/camel-gpg-context.c:847
 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:1129
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -10483,40 +10588,40 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1134
+#: camel/camel-gpg-context.c:1129
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "無法 GPG %s： %s\n"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1242 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:1261 camel/camel-gpg-context.c:1663
-#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, 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:1285 camel/camel-gpg-context.c:1419
-#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
-#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
+#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: camel/camel-gpg-context.c:1304
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "這是數位加簽的郵件"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 #, fuzzy
@@ -10524,29 +10629,29 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1402
+#: camel/camel-gpg-context.c:1397
 #, 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:1483
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "無法寫入資料：%s"
 
-#: camel/camel-gpg-context.c:1541
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位加簽的郵件"
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
 msgstr "索引內文包含"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/camel-gpg-context.c:1642
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "無法從編輯器取得郵件"
@@ -10679,24 +10784,41 @@ msgstr "解密 MIME 組件時失敗：無效的結構"
 msgid "parse error"
 msgstr "解析錯誤"
 
+# camel/camel-session.c:68
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "虛擬資料夾電子郵件供應商"
+
+# camel/camel-session.c:70
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "使讀取郵件如同查詢其他資料夾"
+
 # camel/camel-provider.c:131
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "無法載入模組 %s： 此系統不支援載入模組。"
 
 # camel/camel-provider.c:140
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "無法載入 %s：%s"
 
 # camel/camel-provider.c:148
-#: camel/camel-provider.c:157
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s：模組內沒有初始碼。"
 
+# camel/camel-session.c:295
+# camel/camel-session.c:364
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "沒有通訊協定“%s”的提供者"
+
 # camel/camel-sasl-anonymous.c:33
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
@@ -10866,7 +10988,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:1221
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -11024,25 +11146,8 @@ msgstr "搜尋主機失敗：找不到主機"
 msgid "Host lookup failed: unknown reason"
 msgstr "搜尋主機失敗：不明原因"
 
-# camel/camel-session.c:68
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "虛擬資料夾電子郵件供應商"
-
-# camel/camel-session.c:70
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "使讀取郵件如同查詢其他資料夾"
-
-# camel/camel-session.c:295
-# camel/camel-session.c:364
-#: camel/camel-session.c:352 camel/camel-session.c:402
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "沒有通訊協定“%s”的提供者"
-
 # camel/camel-session.c:479
-#: camel/camel-session.c:524
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -11122,14 +11227,21 @@ msgstr "伺服器： %s，類型： %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "不能取得資料夾：在此儲存空間上無效的操作"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/camel-store.c:244
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "不能取得資料夾：%s：%s"
+
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:284
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建立資料夾：在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-store.c:368 camel/camel-vee-store.c:342
+#: camel/camel-store.c:381 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
@@ -11139,13 +11251,12 @@ msgstr "不能刪除資料夾： %s ：無效的操作"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1129
+#: camel/camel-store.c:779 mail/mail-ops.c:1120
 msgid "Trash"
 msgstr "垃圾桶"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
+#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -11391,23 +11502,35 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:356
+#: camel/camel-vee-store.c:365
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:369
+#: camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:386
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
 
+# camel/providers/local/camel-mbox-summary.c:644
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "無法關閉暫存資料夾： %s"
+
+# camel/providers/local/camel-mbox-summary.c:644
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "無法關閉暫存資料夾： %s"
+
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
@@ -11429,17 +11552,11 @@ msgstr "將過濾器套用於此伺服器上 INBOX 裡的新郵件"
 
 # mail/mail-config.glade.h:12
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "自動檢查新郵件(_A)"
 
-# importers/pine-importer.c:661
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
-msgid "Address Book"
-msgstr "目錄服務"
-
 # addressbook/gui/component/select-names/select-names.glade.h:3
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
@@ -11467,50 +11584,47 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: 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:89
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "密碼"
 
 # camel/providers/imap/camel-imap-provider.c:82
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
-# mail/mail-config.glade.h:21
-#. default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "預設值"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "濃靄"
 
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2827
+#: 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:2888
 msgid "Operation cancelled"
 msgstr "作業已取消"
 
 # camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2830
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:2891
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線： %s"
 
 # camel/providers/imap/camel-imap-command.c:232
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -11520,30 +11634,30 @@ msgstr ""
 "%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的回應： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "伺服器太早傳回結束的回應。"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的 OK 回應： %s"
@@ -11560,7 +11674,7 @@ msgstr "無法建立目錄 %s： %s"
 msgid "Could not load summary for %s"
 msgstr "無法載入給 %s 的摘要"
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "資料夾已破壞並在伺服器上重建。"
 
@@ -11571,7 +11685,7 @@ msgid "Scanning for changed messages"
 msgstr "掃描變更過的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/providers/imap/camel-imap-folder.c:1913
+#: camel/providers/imap/camel-imap-folder.c:1917
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "無法從取回郵件： %s"
@@ -11583,7 +11697,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:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -11602,7 +11716,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:1944
+#: camel/providers/imap/camel-imap-folder.c:1948
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
@@ -11611,20 +11725,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:1967
-#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2567
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: camel/providers/imap/camel-imap-folder.c:2227
-#: camel/providers/imap/camel-imap-folder.c:2297
+#: camel/providers/imap/camel-imap-folder.c:2231
+#: camel/providers/imap/camel-imap-folder.c:2301
 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:2607
+#: camel/providers/imap/camel-imap-folder.c:2605
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
@@ -11697,33 +11811,45 @@ msgstr "命名空間"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "將過濾器套用於此伺服器上 INBOX 裡的新郵件"
 
+# camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "檢查所有資料夾裡的新郵件"
+
+# camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "檢查所有資料夾裡的新郵件"
+
 # camel/providers/imap/camel-imap-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 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:459
+#: camel/providers/imap/camel-imap-store.c:478
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:480
 #, 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:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:601
+#: camel/providers/imap/camel-imap-store.c:621
+#: 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
@@ -11732,7 +11858,7 @@ msgstr "%s 的 IMAP 服務於 %s"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "無法連線至 %s (埠號 %d)： %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:603
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 #, fuzzy
@@ -11740,9 +11866,9 @@ msgid "SSL unavailable"
 msgstr "TLS 無法使用"
 
 # camel/camel-remote-store.c:252
-#: camel/providers/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:618
+#: camel/providers/imap/camel-imap-store.c:850
+#: 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
@@ -11750,61 +11876,61 @@ msgid "Connection cancelled"
 msgstr "連線已取消"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:684
+#: camel/providers/imap/camel-imap-store.c:715
 #, 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:666
+#: camel/providers/imap/camel-imap-store.c:685
 #: 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:697
+#: camel/providers/imap/camel-imap-store.c:716
 #: 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:834
+#: camel/providers/imap/camel-imap-store.c:853
 #, 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:1251
+#: camel/providers/imap/camel-imap-store.c:1270
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1280
 #: 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:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1303
+#: 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:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:1298
+#: camel/providers/imap/camel-imap-store.c:1317
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1346
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -11817,25 +11943,35 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1816
+#: camel/providers/imap/camel-imap-store.c:1693
+#: camel/providers/imap/camel-imap-store.c:1845
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:2017
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:234
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "不能取得資料夾：%s：%s"
+
+#: camel/providers/imap/camel-imap-store.c:2046
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:2058
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾： %s"
 
-#: camel/providers/imap/camel-imap-store.c:2065
+#: camel/providers/imap/camel-imap-store.c:2094
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
@@ -11860,7 +11996,7 @@ msgid ""
 msgstr ""
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "無法連線到 POP 伺服器 %s"
@@ -11952,8 +12088,8 @@ msgstr ""
 
 # camel/providers/local/camel-local-store.c:127
 #: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:335
+#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -11968,64 +12104,64 @@ 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:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:162
+#: camel/providers/local/camel-local-store.c:226
 #, 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:186
+#: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:295
 #, 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:372
+#: camel/providers/local/camel-local-store.c:360
 #, 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:397
-#: camel/providers/local/camel-mbox-store.c:264
+#: camel/providers/local/camel-local-store.c:385
+#: 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:407
-#: camel/providers/local/camel-mbox-store.c:276
+#: camel/providers/local/camel-local-store.c:395
+#: 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:429
-#: camel/providers/local/camel-mbox-store.c:299
+#: camel/providers/local/camel-local-store.c:417
+#: camel/providers/local/camel-mbox-store.c:319
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "無法刪除資料夾摘要檔案“%s”： %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "無法儲存摘要： %s： %s"
 
 # camel/providers/local/camel-local-summary.c:404
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊：不明的原因"
 
@@ -12050,67 +12186,58 @@ msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
-# camel/providers/local/camel-maildir-store.c:96
-# camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-maildir-store.c:106
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"無法開啟資料夾“%s”：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "資料夾“%s”不存在。"
 
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"無法建立資料夾“%s”：\n"
-"%s"
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-maildir-store.c:122
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "“%s”不是一個 maildir 目錄。"
 
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:258
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "無法刪除資料夾“%s”： %s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-maildir-store.c:375
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -12139,9 +12266,9 @@ msgstr "檢查新郵件"
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "儲存資料夾"
@@ -12197,135 +12324,112 @@ msgstr "資料夾好像已經損毀並且不能復原。"
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "郵件結構錯誤：損毀的 mailbox ？"
 
-# camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-store.c:153
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"無法開啟檔案“%s”：\n"
-"%s"
+# camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "無法建立以此為名的資料夾"
 
-# camel/camel-session.c:479
-#: camel/providers/local/camel-mbox-store.c:170
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:206
 #, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"無法建立目錄 %s：\n"
-"%s"
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "不能附加檔案 %s：不是一個合法的檔案"
 
-# camel/providers/local/camel-mbox-store.c:110
-#: camel/providers/local/camel-mbox-store.c:182
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"無法建立檔案“%s”：\n"
+"無法刪除資料夾“%s”：\n"
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-mbox-store.c:192
-#: camel/providers/local/camel-mbox-store.c:235
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "“%s”不是一個合法的檔案。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/local/camel-mbox-store.c:216
-#: camel/providers/local/camel-mbox-store.c:227
-#: camel/providers/local/camel-mbox-store.c:250
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"無法刪除資料夾“%s”：\n"
-"%s"
-
 # camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/local/camel-mbox-store.c:242
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "資料夾“%s”內仍有檔案。所以不刪除。"
 
-# camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-mbox-store.c:341
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "無法建立以此為名的資料夾"
-
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/local/camel-mbox-store.c:354
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "無法建立目錄 %s： %s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-store.c:368
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾：%s：%s"
 
-#: camel/providers/local/camel-mbox-store.c:370
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "名片 ID 已經存在"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: camel/providers/local/camel-mbox-store.c:452
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "指定的資料夾名稱不合法： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-store.c:465
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "無法重新命名“%s”：%s "
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-mbox-store.c:540
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s： %s"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾： %s： %s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "靠近 %ld (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾：%s： %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案： %s： %s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -12333,20 +12437,20 @@ msgstr "不能開啟暫存 mailbox：%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s ： %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "無法關閉暫存資料夾： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾：%s "
@@ -12355,35 +12459,35 @@ msgstr "無法重新命名資料夾：%s "
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "摘要與資料夾不協調，即使經過同步"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "無法儲存資料夾：%s "
 
 # camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "寫入暫存郵箱時發生錯誤：%s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗： %s： %s"
@@ -12399,11 +12503,21 @@ msgstr "MH 增添郵件已取消"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "不能將郵件儲存到 mh 資料夾： %s： %s"
 
-# camel/providers/local/camel-mh-store.c:110
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-mh-store.c:217
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"無法建立資料夾“%s”：\n"
+"%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
 #: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "“%s”不是一個目錄。"
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mh-summary.c:218
 #: camel/providers/local/camel-mh-summary.c:244
@@ -12430,6 +12544,36 @@ msgstr "排程器“%s”不是正規的檔案或目錄"
 msgid "Folder `%s/%s' does not exist."
 msgstr "資料夾“%s/%s”不存在。"
 
+# camel/providers/local/camel-maildir-store.c:96
+# camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"無法開啟資料夾“%s”：\n"
+"%s"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "資料夾“%s”不存在。"
+
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"無法建立資料夾“%s”：\n"
+"%s"
+
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
 #: camel/providers/local/camel-spool-store.c:180
@@ -12700,51 +12844,51 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "不能將資料夾移至其子資料夾之中。"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/nntp/camel-nntp-summary.c:229
+#: camel/providers/nntp/camel-nntp-summary.c:247
 #, fuzzy, c-format
 msgid "Connection error: %s"
 msgstr "不明的錯誤： %s"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/nntp/camel-nntp-summary.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:258
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾： %s"
 
 # camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-summary.c:246
+#: camel/providers/nntp/camel-nntp-summary.c:264
 #, c-format
 msgid "Could not get group: %s"
 msgstr "無法取得群組：%s"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/nntp/camel-nntp-summary.c:311
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "郵件無法傳送： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/nntp/camel-nntp-summary.c:356
+#: camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP 指令失敗： %s"
 
 # mail/mail-ops.c:992
-#: camel/providers/nntp/camel-nntp-summary.c:416
-#: camel/providers/nntp/camel-nntp-summary.c:517
+#: camel/providers/nntp/camel-nntp-summary.c:434
+#: camel/providers/nntp/camel-nntp-summary.c:539
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s：掃描新郵件"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/nntp/camel-nntp-summary.c:532
+#: camel/providers/nntp/camel-nntp-summary.c:554
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "不明的伺服器回應： %s"
 
 # ui/evolution-mail.xml.h:2
-#: camel/providers/nntp/camel-nntp-summary.c:579
+#: camel/providers/nntp/camel-nntp-summary.c:601
 msgid "Use cancel"
 msgstr "使用取消"
 
@@ -12752,7 +12896,7 @@ msgstr "使用取消"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/nntp/camel-nntp-summary.c:581
+#: camel/providers/nntp/camel-nntp-summary.c:603
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗： %s"
@@ -12810,7 +12954,7 @@ msgstr ""
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -12910,7 +13054,7 @@ msgstr "沒有這個資料夾“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -12974,7 +13118,7 @@ msgstr "經由 sendmail 程式傳送郵件"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -13178,7 +13322,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件：寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
 msgid "Sending message"
 msgstr "傳送郵件"
 
@@ -13311,41 +13455,41 @@ msgid "QUIT response error"
 msgstr "QUIT 回應錯誤"
 
 # composer/e-msg-composer-attachment-bar.c:104
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 # composer/e-msg-composer-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 # composer/e-msg-composer-attachment-bar.c:112
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
+#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
 msgid "attachment"
 msgstr "附件"
 
 # composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "自附件清單移除已選擇的項目"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:483
 msgid "Add attachment..."
 msgstr "新增附件..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:484
 msgid "Attach a file to the message"
 msgstr "附加檔案至郵件"
 
@@ -13490,20 +13634,20 @@ msgstr "<按這裏選擇資料夾>"
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:658
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:793
+#: composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -13512,35 +13656,35 @@ msgstr ""
 "讀取檔案 %s 時發生錯誤：\n"
 "%s"
 
-#: composer/e-msg-composer.c:1163
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "檔案已存在，覆蓋它？"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, c-format
 msgid "Error saving file: %s"
 msgstr "儲存檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:1214
+#: composer/e-msg-composer.c:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "載入檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1250
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "存取檔案時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1260
+#: composer/e-msg-composer.c:1258
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -13550,7 +13694,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -13560,7 +13704,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -13570,7 +13714,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1292
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -13580,7 +13724,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
@@ -13590,7 +13734,7 @@ msgstr ""
 "是否嘗試將它復原？"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -13602,47 +13746,47 @@ msgstr ""
 "您希望儲存您的變更嗎？"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "警告：編輯過的郵件"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1602
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "開啟檔案"
 
 # mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:2047
+#: composer/e-msg-composer.c:2045
 msgid "Signature:"
 msgstr "簽名檔:"
 
-#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-#: composer/e-msg-composer.c:2265
+#: composer/e-msg-composer.c:2263
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2294
+#: composer/e-msg-composer.c:2292
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
 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:2314 composer/e-msg-composer.c:3040
-#: composer/e-msg-composer.c:3041
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
+#: composer/e-msg-composer.c:3054
 msgid "Compose a message"
 msgstr "編輯郵件"
 
-#: composer/e-msg-composer.c:3072
+#: composer/e-msg-composer.c:3083
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -13651,7 +13795,7 @@ msgstr ""
 "無法作用位址選擇器控制元。"
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3101
+#: composer/e-msg-composer.c:3112
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -13664,7 +13808,7 @@ msgstr ""
 "的 gtkhtml 與 libgtkhtml 。\n"
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3201
+#: composer/e-msg-composer.c:3216
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -13672,7 +13816,7 @@ msgstr ""
 "無法建立郵件編輯視窗：\n"
 "無法作用 HTML 編輯器元件。"
 
-#: composer/e-msg-composer.c:4222
+#: composer/e-msg-composer.c:4237
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -14090,7 +14234,7 @@ msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
 #: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "選擇資料夾"
@@ -14105,7 +14249,7 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:68
+#: mail/mail-config.c:63 mail/mail-config.glade.h:66
 msgid "Important"
 msgstr "重要"
 
@@ -14113,14 +14257,14 @@ msgstr "重要"
 # mail/message-list.c:1083
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 msgid "To Do"
 msgstr "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Later"
 msgstr "稍後"
 
@@ -14209,7 +14353,7 @@ msgstr ""
 "郵件日期將會與過濾器執行時的\n"
 "時間作比較。"
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
 msgid "Virtual Folders"
 msgstr "虛擬資料夾"
 
@@ -14225,7 +14369,7 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "秒"
 
@@ -14399,7 +14543,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:780
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "標籤"
@@ -14519,9 +14663,10 @@ msgstr "停止處理"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
+#: 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:305
+#: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "主旨"
 
@@ -14529,25 +14674,25 @@ msgstr "主旨"
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1005
+#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
+#: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "規則名稱“%s”並不是唯一的，請選擇其他的。"
 
-#: filter/rule-editor.c:170
+#: filter/rule-editor.c:172
 msgid "Rules"
 msgstr "規則"
 
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:293
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: filter/rule-editor.c:373
+#: filter/rule-editor.c:375
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: filter/rule-editor.c:692
+#: filter/rule-editor.c:699
 msgid "Rule name"
 msgstr "規則名稱"
 
@@ -14592,15 +14737,15 @@ msgid "Subject does not contain"
 msgstr "主旨不包含"
 
 # ui/evolution.xml.h:3
-#: filter/vfolder-rule.c:209
+#: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
 msgstr "您必須為這個虛擬資料夾命名。"
 
-#: filter/vfolder-rule.c:223
+#: filter/vfolder-rule.c:229
 msgid "You need to to specify at least one folder as a source."
 msgstr "您需要指定至少一個資料夾做為來源。"
 
-#: filter/vfolder-rule.c:546
+#: filter/vfolder-rule.c:585
 msgid "VFolder source"
 msgstr "虛擬資料夾來源"
 
@@ -14669,9 +14814,9 @@ 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:817
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:473
 msgid "Mail"
 msgstr "郵件"
 
@@ -14680,7 +14825,7 @@ msgstr "郵件"
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
@@ -14728,16 +14873,16 @@ msgid "[script]"
 msgstr "[命令稿]"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: mail/em-composer-prefs.c:862
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
 msgstr "語言"
 
-#: mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
 msgstr "新增命令稿簽名檔"
 
 # mail/mail-config.glade.h:74
-#: mail/em-composer-prefs.c:924
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
 msgstr "簽名檔"
 
@@ -14835,7 +14980,6 @@ msgid "Unread messages"
 msgstr "下一封未閱讀的郵件(_U)"
 
 #: mail/em-folder-selection-button.c:120
-#: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
@@ -14845,67 +14989,68 @@ msgid "Create New Folder"
 msgstr "建立新資料夾"
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
+#: mail/mail-component.c:597
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "指定建立資料夾的位置："
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:267
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "資料夾名稱:"
 
-#. On This Computer is always first and VFolders is always last
-#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162
-#: mail/mail-component.c:170
-msgid "On this Computer"
-msgstr ""
-
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166
-#: mail/mail-vfolder.c:853
+#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
+#: mail/mail-vfolder.c:855
 msgid "VFolders"
 msgstr "虛擬資料夾"
 
-#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176
+#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
 msgid "UNMATCHED"
 msgstr ""
 
 # mail/local-config.glade.h:8
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-#: shell/e-shortcuts.c:1085
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "Inbox"
 msgstr "收件匣"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730
+#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
 msgid "Loading..."
 msgstr "載入中..."
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: mail/em-folder-tree.c:818
+#: mail/em-folder-tree.c:831
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
-#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808
+# camel/providers/local/camel-mbox-summary.c:655
+#: mail/em-folder-tree.c:1798
+#, fuzzy, c-format
+msgid "Cannot move folder `%s': illegal operation"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
 #, c-format
 msgid "%s"
 msgstr ""
 
 # shell/e-shell-importer.c:601
-#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750
-#: mail/em-folder-view.c:657 mail/em-folder-view.c:671
+#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
+#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 # ui/evolution.xml.h:10
-#: mail/em-folder-tree.c:1843
+#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
 #, fuzzy
 msgid "Create folder"
 msgstr "新增一個資料夾"
@@ -14913,14 +15058,21 @@ msgstr "新增一個資料夾"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: mail/em-folder-tree.c:1962
+#: mail/em-folder-tree.c:2069
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "無法刪除資料夾“%s”： %s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: mail/em-folder-tree.c:1983
+#: mail/em-folder-tree.c:2094
+#, fuzzy, c-format
+msgid "Cannot delete local %s folder."
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: mail/em-folder-tree.c:2100
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "確定要刪除資料夾“%s”？"
@@ -14936,26 +15088,32 @@ msgstr "確定要刪除資料夾“%s”？"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:2110
 #, c-format
 msgid "Delete \"%s\""
 msgstr "刪除“%s”"
 
+# camel/providers/local/camel-local-store.c:237
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Cannot rename local %s folder."
+msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
+
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2153
 #, 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:2029 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2155
 #, fuzzy
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
 
-#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:2179
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
@@ -14964,33 +15122,33 @@ 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:2099 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
 #: 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:2100
+#: mail/em-folder-tree.c:2226
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "在新視窗開啟"
 
 # ui/evolution-mail.xml.h:55
-#: mail/em-folder-tree.c:2105
+#: mail/em-folder-tree.c:2231
 #, fuzzy
 msgid "_Move"
 msgstr "移動"
 
 # ui/evolution.xml.h:59
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2109
+#: mail/em-folder-tree.c:2235
 #, fuzzy
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)"
 
 # ui/evolution.xml.h:61
-#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:2238
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -14998,13 +15156,13 @@ 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:2115 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
 # 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:748 mail/em-popup.c:658
+#: mail/em-folder-view.c:751 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -15012,37 +15170,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:750
+#: mail/em-folder-view.c:753
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:754 mail/em-popup.c:778
+#: mail/em-folder-view.c:757 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:755 mail/em-popup.c:779
+#: mail/em-folder-view.c:758 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/em-folder-view.c:756 mail/em-popup.c:781
+#: mail/em-folder-view.c:759 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:762
 msgid "Follo_w Up..."
 msgstr "跟隨(_W)..."
 
@@ -15050,220 +15208,229 @@ 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:760
+#: mail/em-folder-view.c:763
 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:761
+#: mail/em-folder-view.c:764
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
 # mail/folder-browser.c:704
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:765
+#: mail/em-folder-view.c:768
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:769
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:767
+#: mail/em-folder-view.c:770
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:776
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
 # mail/folder-browser.c:711
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:779
 msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_V)..."
 
 # mail/folder-browser.c:713
-#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:788
 msgid "Add Sender to Address_book"
 msgstr "新增寄件者到目錄服務(_B)"
 
 # mail/folder-browser.c:727
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:791
 msgid "Appl_y Filters"
 msgstr "套用過濾器(_Y)"
 
 # mail/folder-browser.c:731
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:794
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:653
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:795
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:796
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:797
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:798
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:668
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:804
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:805
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/folder-browser.c:674
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:806
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
 # mail/folder-browser.c:677
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:807
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立過濾器(_M)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:809
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "從寄件者建立過濾器(_D)"
 
+# mail/mail-config.glade.h:21
+#. default charset used in mail view
+#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "預設值"
+
 # mail/mail-callbacks.c:1407
-#: mail/em-folder-view.c:1652
+#: mail/em-folder-view.c:1660
 msgid "Print Message"
 msgstr "列印郵件"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/em-folder-view.c:1906
+#: mail/em-folder-view.c:1907
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "複製連結位址"
 
 # calendar/gui/e-calendar-table.c:163
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2174
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "請按這裡增加新的工作"
 
 # mail/mail-search.c:319
 #. message-search popup match count string
-#: mail/em-format-html-display.c:403
+#: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "符合的資料:"
 
 # calendar/gui/calendar-model.c:1578
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
 #, fuzzy
 msgid "Unsigned"
 msgstr "已指定"
 
 # mail/mail-format.c:1161
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
+"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:640 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
 msgstr "儲存簽名檔"
 
-#: mail/em-format-html-display.c:640
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:639
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
-msgstr ""
+"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:641 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
 msgstr "儲存簽名檔"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:642
+#: mail/em-format-html-display.c:641
 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:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
 #, fuzzy
 msgid "Unencrypted"
 msgstr "已中斷"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:648
 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 "
@@ -15271,69 +15438,69 @@ msgid ""
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:13
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP 加密"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:649
 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:651 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:651
+#: mail/em-format-html-display.c:650
 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:735
+#: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
 msgstr "憑證 ID(_C):"
 
-#: mail/em-format-html-display.c:740
+#: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "憑證尚未生效"
 
 # mail/message-list.c:977
-#: mail/em-format-html-display.c:976
+#: mail/em-format-html-display.c:973
 #, 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:984
+#: mail/em-format-html-display.c:981
 msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:984
 #, 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:1057
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_View Inline"
 msgstr "檢視行內"
 
 # mail/mail-display.c:363
-#: mail/em-format-html-display.c:1058
+#: mail/em-format-html-display.c:1055
 #, fuzzy
 msgid "_Hide"
 msgstr "隱藏"
 
 # camel/camel-filter-driver.c:748
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
@@ -15386,35 +15553,40 @@ msgstr "移動郵件"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1375 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:301
 msgid "From"
 msgstr "寄件者"
 
 # mail/mail-format.c:759
-#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1375 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:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1375 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
-#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632
+#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:729
 msgid "Mailer"
 msgstr "寄件者"
 
@@ -15430,8 +15602,8 @@ msgstr ""
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1532 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 "日期"
 
@@ -15452,21 +15624,26 @@ msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
 # mail/mail-format.c:573
-#: mail/em-format.c:1295
+#: mail/em-format.c:1297
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-#: mail/em-format.c:1312
+#: mail/em-format.c:1316
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "不支援的基模"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1324
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
+
+#: mail/em-format.c:1324
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "驗證 leaf 憑證失敗。"
 
-#: mail/em-junk-filter.c:76
+#: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
 
@@ -15480,75 +15657,75 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "快取 %s 失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "快取 %s 失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
-#: mail/em-popup.c:668
+#: mail/em-popup.c:698
 msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-search.c:138
-#: mail/em-popup.c:686
+#: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "未命名的郵件"
 
-#: mail/em-popup.c:775
+#: mail/em-popup.c:805
 msgid "Set as _Background"
 msgstr ""
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-popup.c:777
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/mail-display.c:1256
-#: mail/em-popup.c:825
+#: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-contact-editor.xml.h:13
-#: mail/em-popup.c:826
+#: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "傳送郵件給清單(_M)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-popup.c:827
+#: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "新增寄件者到目錄服務"
 
 # mail/mail-display.c:299
-#: mail/em-popup.c:933
+#: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -15608,13 +15785,13 @@ msgstr "轉寄的郵件"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/em-utils.c:1136
+#: mail/em-utils.c:1139
 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:1146
+#: mail/em-utils.c:1149
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
@@ -15626,7 +15803,7 @@ msgstr "在 %a, %Y-%m-%d %H:%M, %%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/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
+#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -15635,7 +15812,7 @@ msgstr ""
 "無法儲存到“%s”\n"
 " %s"
 
-#: mail/em-utils.c:1428
+#: mail/em-utils.c:1431
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -15645,37 +15822,44 @@ msgstr ""
 "您是否要複蓋它？"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/em-utils.c:1471
+#: mail/em-utils.c:1474
 #, fuzzy
 msgid "message"
 msgstr "訊息"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: mail/em-utils.c:1523
+#: mail/em-utils.c:1526
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "排程器“%s”不存在或不是一個合法的檔案。"
 
 # mail/mail-callbacks.c:1188
-#: mail/em-utils.c:1577
+#: mail/em-utils.c:1580
 #, fuzzy
 msgid "Save Message..."
 msgstr "另存郵件..."
 
 # addressbook/backend/ebook/e-card.c:3346
-#: mail/em-utils.c:1615
+#: mail/em-utils.c:1618
 #, fuzzy
 msgid "Add address"
 msgstr "地址"
 
+# mail/mail-autofilter.c:229
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2052
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "郵件來自 %s "
+
 # mail/mail-display.c:236
-#: mail/em-utils.c:2085
+#: mail/em-utils.c:2103
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "無法建立暫存目錄： %s"
 
-#: mail/em-utils.c:2403
+#: mail/em-utils.c:2434
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -15688,7 +15872,7 @@ msgstr ""
 "\n"
 "確定清除這些郵件？"
 
-#: mail/em-utils.c:2429
+#: mail/em-utils.c:2459
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -15718,220 +15902,236 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour"
+msgid "Citation highlight colour."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
-msgid "Citation highlight colour."
+msgid "Composer Window default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:7
-msgid "Default charset in which to compose messages"
+msgid "Composer Window default width"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr ""
 
 # ui/evolution-mail.xml.h:75
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-mail.xml.h:75
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-mail.xml.h:34
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default forward style"
 msgstr "轉寄方式(_F):"
 
 # ui/evolution.xml.h:32
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "切換資料夾清單的顯示狀態"
+
+# ui/evolution.xml.h:32
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "切換資料夾清單的顯示狀態"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
 msgstr "回覆方式(_R):"
 
 # ui/evolution.xml.h:32
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "切換資料夾清單的顯示狀態"
+
+# ui/evolution.xml.h:32
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "切換資料夾清單的顯示狀態"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "離開時清空垃圾桶資料夾(_T)"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "離開時清空垃圾桶資料夾(_T)"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:25
 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:23
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of Labels and their associated colours"
 msgstr ""
 
 # mail/mail-config.glade.h:6
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 msgid "List of accounts"
 msgstr "郵件帳號"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:28
 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:26
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 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."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "Log filter actions"
 msgstr "執行動作"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Message Window default hight"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
 # mail/mail-config.glade.h:40
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "新郵件通知"
 
 # mail/mail-config.glade.h:40
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "新郵件通知"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
 # ui/evolution-mail.xml.h:14
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -15939,115 +16139,109 @@ msgid ""
 msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:53
 #, 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:51
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
-msgid ""
-"Run junk test on incoming mail for IMAP accounts (only valid if "
-"check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:200
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "傳送 HTML 格式的電子郵件？"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:200
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "傳送 HTML 格式的電子郵件？"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Show Animations"
 msgstr "顯示動畫影像(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "顯示動畫影像(_S)"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
 # ui/evolution-mail.xml.h:86
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "使用正常模式顯示郵件"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "預覽面板(_P)"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Spell check inline"
 msgstr "拼字檢查(_C)"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Terminal font"
 msgstr "原本的連絡人:"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 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;"
@@ -16056,112 +16250,112 @@ msgid ""
 msgstr ""
 
 # ui/evolution-mail.xml.h:93
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Thread the message list."
 msgstr "相關郵件清單"
 
 # ui/evolution-mail.xml.h:93
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "相關郵件清單"
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
 # mail/mail-config.glade.h:41
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "設為我的預設帳號(_M)"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
 # mail/mail-accounts.c:197
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 #, fuzzy
 msgid "Variable width font"
 msgstr "可變寬度(_A):"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 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:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "port for starting user runned spamd"
 msgstr ""
 
@@ -16170,79 +16364,75 @@ msgstr ""
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "spamd port"
 msgstr "匯入"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#: 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_Mbox_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution 郵件編輯器。"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: 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_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Pine importer"
 msgstr "Evolution 郵件編輯器。"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+# 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_Outlook_Importer.server.in.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution 郵件編輯器。"
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
-#: mail/importers/elm-importer.c:105
+#: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution 正在匯入您舊有的 Elm 郵件"
 
 # shell/e-shell-importer.c:363
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
+#: 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:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "匯入..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: 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:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "請稍候"
 
-# shell/e-shell-importer.c:371
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
-msgstr "匯入 %s 為 %s"
-
-# mail/mail-ops.c:599
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, c-format
-msgid "Scanning %s"
-msgstr "掃描 %s"
+# shell/e-shell-importer.c:363
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "匯入檔案中"
 
 # importers/elm-importer.c:561
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -16250,17 +16440,50 @@ msgstr ""
 "Evolution 找到 Elm 格式的郵件檔案\n"
 "您是否要將它們匯入至 Evolution？"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
+# ui/evolution.xml.h:47
+#: mail/importers/evolution-mbox-importer.c:116
+#, fuzzy
+msgid "Destination folder:"
+msgstr "刪除這個資料夾"
+
+# mail/mail-account-gui.c:682
+#: mail/importers/evolution-mbox-importer.c:119
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "選擇匯入服務"
+
+# shell/e-shell-importer.c:363
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
+#: mail/importers/mail-importer.c:220
+#, 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
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "匯入檔案中"
+
+# mail/mail-ops.c:599
+#: mail/importers/mail-importer.c:354
+#, c-format
+msgid "Scanning %s"
+msgstr "掃描 %s"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "優先順序過濾器“%s”"
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:650
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -16286,7 +16509,7 @@ msgstr ""
 "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
 "照您想要的方式運作。"
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:674
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -16298,7 +16521,7 @@ msgstr ""
 "功能，而 Evolution 並不支援它。\n"
 "這些過濾器則會被丟棄。"
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:691
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -16312,36 +16535,27 @@ msgstr ""
 "會被修改成測試郵件的內文是否包含\n"
 "該字串。"
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-# camel/providers/local/camel-local-store.c:183
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "掃描郵件過濾器"
-
-# camel/providers/imap/camel-imap-folder.c:364
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "掃描目錄"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
-msgid "Starting import"
-msgstr "開始匯入"
+#: mail/importers/netscape-importer.c:1677
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "設定"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr "郵件規則"
 
 # importers/netscape-importer.c:847
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -16349,12 +16563,23 @@ msgstr ""
 "Evolution 找到 Netscape 格式的郵件。\n"
 "您是否要將它們匯入至 Evolution？"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution 正在匯入您舊有的 Pine 資料"
 
+# shell/e-shell-importer.c:363
+#: mail/importers/pine-importer.c:313
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "匯入檔案中"
+
+# importers/pine-importer.c:661
+#: mail/importers/pine-importer.c:478
+msgid "Addressbook"
+msgstr "目錄服務"
+
 # importers/pine-importer.c:705
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -16369,7 +16594,7 @@ msgstr ""
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:505
 msgid "Pine"
 msgstr "Pine"
 
@@ -16420,24 +16645,24 @@ msgstr "您沒有填入所有必須的資訊。"
 
 # mail/mail-account-editor.c:173
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:140
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "主機(_H):"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "路徑(_P):"
 
@@ -16495,34 +16720,51 @@ msgstr ""
 "    '%s'\n"
 "並已更新。"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:487
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:522
+#: mail/mail-component.c:546
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:523
+#: mail/mail-component.c:547
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-component.c:524
+#: mail/mail-component.c:548
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
+# mail/mail-vfolder.c:438
+#: mail/mail-component.c:553
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "新增虛擬資料夾"
+
+#: mail/mail-component.c:554
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "郵件規則"
+
+# ui/evolution.xml.h:10
+#: mail/mail-component.c:555
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "新增一個資料夾"
+
 # calendar/gui/control-factory.c:126
-#: mail/mail-component.c:657
+#: mail/mail-component.c:722
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "行事曆將顯示的 URI "
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "身分"
 
@@ -16571,7 +16813,7 @@ msgstr ""
 "服務供應商。"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "帳號總管"
 
@@ -16598,94 +16840,90 @@ msgstr "檢查服務"
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
-#: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr " 檢查可支援的類別(_C) "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(此一版本的 Evolution 並不支援 SSL)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(此一版本的 evolution 並不支援 SSL)"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密(_L)"
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "帳號資訊"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "新增命令稿(_R)"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "加入新的簽名檔..."
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密(_W)"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "永遠寄送密件副本(Bcc)給(_B):"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "永遠寄送副本(Cc)給(_C):"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任在我的鑰匙圈裡的金鑰"
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "附加原始訊息"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "驗證"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "字集(_H):"
 
@@ -16696,48 +16934,48 @@ msgstr "字集(_H):"
 # ui/evolution-subscribe.xml.h:2
 # ui/evolution-task-editor-dialog.xml.h:11
 # ui/evolution.xml.h:5
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "顏色(_O)"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "檢查新郵件"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "編輯郵件中"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "組態"
 
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -16755,86 +16993,82 @@ msgstr ""
 "請按“完成”來儲存您的設定。"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "預設行為"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "預設字元編碼(_E):"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "刪除郵件中"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "不要引用原始訊息"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要加簽會議邀請(為了相容 Outlook)(_M)"
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "草稿匣(_F):"
 
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "電子郵件位址(_A):"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "離開時清空垃圾桶資料夾(_T)"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "憑證 ID(_C):"
 
 # mail/mail-config-druid.c:445
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "執行指令..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "固定寬度(_X):"
 
 # addressbook/printing/e-contact-print.glade.h:23
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< 減少選項"
@@ -16842,250 +17076,250 @@ msgstr "<< 減少選項"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "字型內容"
 
 # mail/mail-ops.c:1154
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "頁首"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr "行內"
 
 # mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
 # ui/evolution-contact-editor.xml.h:9
 # ui/evolution-event-editor.xml.h:42
 # ui/evolution-task-editor-dialog.xml.h:52
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "標籤與顏色"
 
 # ui/evolution-mail.xml.h:46
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "載入影像"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "信箱位置"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "郵件顯示"
 
 # addressbook/gui/component/addressbook.c:619
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "郵件包含"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr "新郵件通知"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在您首次連線之前將不會提示您輸入密碼"
 
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "選用的資訊"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鑰匙 ID(_K):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "選取顏色"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "相當高的隱私 (PGP/GPG)"
 
 # ui/evolution-addressbook.xml.h:11
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "列印的字型"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "引用原始訊息"
 
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "引用"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "記住這個密碼(_M)"
 
 # composer/e-msg-composer-hdrs.c:361
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
 # mail/mail-config.glade.h:57
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
 # mail/mail-config.glade.h:59
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "接收郵件選項(_O)"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "記住這個密碼(_P)"
 
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "所需資訊"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "還原預設值"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "安全性(_E)"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "安全的 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於列印的 HTML 固定寬度字型"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "傳送郵件資料夾(_M)"
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "傳送與草稿郵件"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "伺服器設定"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "在憑證鏈中的自我加簽憑證"
 
 # addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "拼字檢查(_C)"
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "標準 Unix mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -17095,7 +17329,7 @@ msgstr ""
 "簽名檔。您所指定的名稱將只做為\n"
 "顯示之用。"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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 "
@@ -17104,7 +17338,7 @@ msgstr ""
 "這一頁允許您設定拼字檢查的行為和語言。這裡的語言清單只反映出您已經安裝字典的"
 "語言。"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -17112,17 +17346,17 @@ msgstr ""
 "輸入您想要用來代表這個帳號的名稱。\n"
 "例如：“工作”或“個人”"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -17134,211 +17368,211 @@ msgstr ""
 "按“下一步”開始。"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "永遠自網路下載影像(_A)"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "驗證類別(_A): "
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "驗證類別(_A): "
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "自動檢查新郵件(_A)"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "自動插入笑臉影像(_A)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "當新郵件到達時發出嗶聲(_B)"
 
 # mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "刪除資料夾時確認(_C)"
 
 # calendar/gui/e-day-view.c:3179
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "預設的簽名檔(_D):"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "預設值(_D)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "當新郵件到達時不要通知我(_D)"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
 # ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "全名(_F):"
 
 # mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "_HTML 格式郵件"
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "身分(_I)"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "6月"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "如果寄件者在目錄服務中就載入影像(_L)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "標示郵件為稍後閱讀(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "永遠不自網路下載影像(_N)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "接收郵件(_R)"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "還原預設值(_R)"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
 # ui/evolution-contact-editor.xml.h:3
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "傳送郵件(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "顯示動畫影像(_S)"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "簽名檔(_S)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "桑波恩"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "原本的連絡人:"
 
 # mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全連線 (SSL)(_U):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "描述"
 
 # mail/mail-ops.c:599
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -17366,7 +17600,7 @@ msgstr ""
 # mail/mail-mt.c:516
 # mail/mail-mt.c:545
 # mail/mail-mt.c:880
-#: mail/mail-mt.c:903
+#: mail/mail-mt.c:902
 msgid "Working"
 msgstr "正在工作"
 
@@ -17381,12 +17615,12 @@ msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:528
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:553
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -17394,143 +17628,143 @@ msgid ""
 msgstr ""
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:562
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:612
+#: mail/mail-ops.c:604
 #, c-format
 msgid "Sending \"%s\""
 msgstr "傳送“%s”"
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:722
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
 # mail/mail-ops.c:737
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:741
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在處理郵件 %d / %d 時失敗"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:743
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:931
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1035
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描“%s”內的資料夾"
 
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1231
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾“%s”"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1583
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1584
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "貯藏資料夾“%s”"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1648
+#: mail/mail-ops.c:1639
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1684 mail/mail-ops.c:1735
+#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1723
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-config.glade.h:76
-#: mail/mail-ops.c:1733
+#: mail/mail-ops.c:1724
 msgid "Local Folders"
 msgstr "本機資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1807
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1888
+#: mail/mail-ops.c:1879
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "取回 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1963
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "儲存 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2011
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -17540,7 +17774,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:2039
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -17550,12 +17784,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:2119
+#: mail/mail-ops.c:2110
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2136
+#: mail/mail-ops.c:2127
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -17565,24 +17799,24 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2166
+#: mail/mail-ops.c:2157
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2314
+#: mail/mail-ops.c:2305
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
-#: mail/mail-ops.c:2416
+#: mail/mail-ops.c:2407
 msgid "Changing junk status"
 msgstr ""
 
@@ -17626,46 +17860,46 @@ msgid "Security Information"
 msgstr "帳號資訊"
 
 # mail/mail-send-recv.c:138
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 msgid "Cancelling..."
 msgstr "正在取消..."
 
 # mail/mail-config.glade.h:72
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "伺服器： %s，類型： %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路徑： %s，類型： %s"
 
 # addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, c-format
 msgid "Type: %s"
 msgstr "類型： %s"
 
 # mail/mail-send-recv.c:233
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
 # ui/evolution-mail.xml.h:2
-#: mail/mail-send-recv.c:314
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
 msgstr "全部取消"
 
 # mail/mail-send-recv.c:285
-#: mail/mail-send-recv.c:395
+#: mail/mail-send-recv.c:396
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
+#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
 msgid "Waiting..."
 msgstr "正在等待..."
 
@@ -17800,21 +18034,21 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:923
+#: mail/mail-vfolder.c:925
 msgid "vFolders"
 msgstr "虛擬資料夾"
 
-#: mail/mail-vfolder.c:962
+#: mail/mail-vfolder.c:964
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
-#: mail/mail-vfolder.c:982
+#: mail/mail-vfolder.c:984
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "嘗試編輯不存在的虛擬資料夾“%s”。"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:1054
+#: mail/mail-vfolder.c:1056
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
@@ -18220,117 +18454,22 @@ msgstr "離線資料夾"
 msgid "Autocompletion Folders"
 msgstr "自動補齊資料夾"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "不能複製資料夾：%s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "不能移動資料夾：%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "不能將資料夾移動到它自己。"
-
-# shell/e-setup.c:230
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "不能複製資料夾到它自己。"
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "不能將資料夾移至其子資料夾之中。"
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "指定要複製資料夾“%s”進去的資料夾："
-
-# ui/evolution.xml.h:7
-#: shell/e-shell-folder-commands.c:323
-#, fuzzy
-msgid "Copy Folder"
-msgstr "複製資料夾"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "指定要移動資料夾“%s”進去的資料夾："
-
-#: shell/e-shell-folder-commands.c:367
-#, fuzzy
-msgid "Move Folder"
-msgstr "移動資料夾"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"不能刪除資料夾：\n"
-"%s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "確定要刪除資料夾“%s”？"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:489
+# shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
 msgid ""
-"Cannot rename folder:\n"
+"Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"不能重新命名資料夾：\n"
+"不能建立指定的資料夾：\n"
 "%s"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "指定的資料夾名稱不合法： %s"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "選擇的資料夾不屬於其他使用者"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"不能移除資料夾：\n"
-"%s"
-
-# shell/e-shell-folder-creation-dialog.c:99
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"不能建立指定的資料夾：\n"
-"%s"
-
 # 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
@@ -18500,7 +18639,7 @@ msgid "_Import"
 msgstr "匯入"
 
 # shell/e-shell-offline-handler.c:554
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
 msgstr "關閉連線..."
 
@@ -18549,6 +18688,10 @@ msgstr "無法開啟共用的資料夾：%s。"
 msgid "Cannot find the specified shared folder."
 msgstr "找不到指定的共用資料夾。"
 
+#: shell/e-shell-startup-wizard.c:569
+msgid "Starting import"
+msgstr "開始匯入"
+
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
@@ -18670,160 +18813,6 @@ msgstr "找不到組態資料庫"
 msgid "Generic error"
 msgstr "一般錯誤"
 
-# shell/e-shortcuts-view.c:134
-#: shell/e-shortcuts-view.c:80
-#, fuzzy
-msgid "Create New Shortcut Group"
-msgstr "新增功能群組"
-
-# shell/e-shortcuts-view.c:137
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "群組名稱:"
-
-# shell/e-shortcuts-view.c:260
-#: shell/e-shortcuts-view.c:179
-#, fuzzy, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
-"您確定要將群組\n"
-"“%s”自功能列移除？"
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "重新命名功能群組"
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "更改選定功能群組的名稱為："
-
-# shell/e-shortcuts-view.c:276
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "小圖示(_S)"
-
-# shell/e-shortcuts-view.c:277
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "以小圖示顯示功能項目"
-
-# shell/e-shortcuts-view.c:279
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "大圖示(_L)"
-
-# shell/e-shortcuts-view.c:280
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "以大圖示顯示功能項目"
-
-# shell/e-shortcuts-view.c:291
-#: shell/e-shortcuts-view.c:270
-#, fuzzy
-msgid "_Add Group..."
-msgstr "新增群組(_N)..."
-
-# shell/e-shortcuts-view.c:292
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "新增功能群組"
-
-# shell/e-shortcuts-view.c:294
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "移除這個群組(_R)..."
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "移除這個功能群組"
-
-# shell/e-shortcuts-view.c:294
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "重新命名這個群組(_N)..."
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "更改這個功能群組的名稱"
-
-# shell/e-shortcuts-view.c:300
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "隱藏功能列(_H)"
-
-# shell/e-shortcuts-view.c:301
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "隱藏功能列"
-
-# shell/e-shortcuts-view.c:292
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "建立預設功能(_D)"
-
-# shell/e-shortcuts-view.c:292
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "建立預設功能"
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:408
-#, fuzzy
-msgid "Rename Shortcut"
-msgstr "重新命名功能"
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "更改選定功能的名稱為："
-
-# ui/evolution.xml.h:26
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "開啟連結至這個功能的資料夾"
-
-# ui/evolution.xml.h:25
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "在新視窗開啟(_W)"
-
-# ui/evolution-mail.xml.h:59
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "使用新視窗開啟連結至這個功能的資料夾"
-
-# shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-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
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "移除(_M)"
-
-# shell/e-shortcuts-view.c:388
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "將功能項目從功能列移除"
-
-# shell/e-shortcuts.c:381
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "儲存功能項目時發生錯誤。"
-
-# ui/evolution.xml.h:62
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "功能"
-
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
@@ -18839,11 +18828,6 @@ msgstr "核取方塊"
 msgid "New"
 msgstr "新增"
 
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "“%s”在“%s”"
-
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
 #: shell/evolution-shell-component-utils.c:124
@@ -19201,41 +19185,41 @@ msgstr ""
 "  使用 %s --help 取得進一步資訊。\n"
 
 # mail/mail-account-gui.c:682
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
-#: smime/gui/certificate-manager.c:458
+#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
+#: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "選擇匯入服務"
 
-#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
-#: smime/gui/certificate-manager.c:541
+#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
+#: smime/gui/certificate-manager.c:546
 #, fuzzy
 msgid "Certificate Name"
 msgstr "憑證 ID(_C):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
+#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
 #, fuzzy
 msgid "Purposes"
 msgstr "進度"
 
-#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:257
+#: smime/gui/certificate-manager.c:262
 #, fuzzy
 msgid "Expires"
 msgstr "詞句"
 
 # mail/mail-config.glade.h:29
-#: smime/gui/certificate-manager.c:403
+#: smime/gui/certificate-manager.c:408
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "電子郵件地址:"
 
-#: smime/gui/certificate-viewer.c:326
+#: smime/gui/certificate-viewer.c:331
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
@@ -19243,20 +19227,20 @@ msgstr ""
 "發照者： %s"
 
 # camel/camel-smime-context.c:194
-#: smime/gui/component.c:36
+#: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "請輸入 %s 所需的密碼"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19328,7 +19312,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
 msgstr "憑證 ID(_C):"
@@ -19412,11 +19396,11 @@ msgstr "團體單位"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -19469,7 +19453,7 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert-db.c:566
+#: smime/lib/e-cert-db.c:571
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "名片 ID 已經存在"
@@ -19479,253 +19463,253 @@ msgstr "名片 ID 已經存在"
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 # widgets/misc/e-dateedit.c:1284
 # widgets/misc/e-dateedit.c:1465
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:473
+#: smime/lib/e-cert.c:478
 #, fuzzy
 msgid "Version"
 msgstr "佛蒙特"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:493
 #, fuzzy
 msgid "Version 1"
 msgstr "佛密良"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:496
 #, fuzzy
 msgid "Version 2"
 msgstr "佛密良"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:499
 #, fuzzy
 msgid "Version 3"
 msgstr "佛密良"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:590
 #, fuzzy
 msgid "C"
 msgstr " C"
 
 # calendar/gui/calendar-model.c:457
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:593
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:596
 msgid "OU"
 msgstr ""
 
 # widgets/misc/e-cell-date-edit.c:245
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:599
 #, fuzzy
 msgid "O"
 msgstr "確認"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
 # calendar/gui/calendar-model.c:457
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:605
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:608
 msgid "DC"
 msgstr ""
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:611
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "憑證不被信任"
 
 # addressbook/contact-editor/fullname.glade.h:4
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:626
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
 # mail/mail-autofilter.c:213
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "主旨是 %s"
 
 # camel/camel-filter-driver.c:652
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "無法處理 spool 資料夾"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "無效的憑證機構 (CA)"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "無效的憑證機構 (CA)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:814
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "沒有資訊"
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
 msgstr ""
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "附件"
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:830
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Critical"
 msgstr "古里提巴"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
 msgstr "北卡羅來納"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:912
 #, fuzzy
 msgid "Extensions"
 msgstr "詞句"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:983
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s 在 %s"
 
 # mail/mail-crypto.c:59
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "憑證簽章失敗"
 
 # ui/evolution-message-composer.xml.h:49
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1048
 #, fuzzy
 msgid "Issuer"
 msgstr "插入(_I)"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
 msgstr ""
 
 # mail/mail-autofilter.c:213
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "主旨是 %s"
 
 # mail/mail-crypto.c:59
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "憑證簽章失敗"
 
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
 # camel/camel-smime-context.c:194
-#: smime/lib/e-pkcs12.c:261
+#: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "請輸入 %s 所需的密碼"
 
-#: smime/lib/e-pkcs12.c:359
+#: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "憑證 ID(_C):"
@@ -20512,7 +20496,8 @@ msgstr "相關郵件清單(_T)"
 
 # addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "新增寄件者到目錄服務(_D)"
 
 # mail/folder-browser.c:727
@@ -20522,7 +20507,8 @@ msgstr "套用過濾器(_P)"
 
 # addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "新增寄件者到目錄服務"
 
 # ui/evolution-mail.xml.h:1
@@ -21103,14 +21089,6 @@ msgstr "格式(_M)"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-# 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
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "開啟"
-
 # ui/evolution-message-composer.xml.h:12
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
@@ -21588,24 +21566,6 @@ msgstr "傳送/接收 (_S)"
 msgid "_Window"
 msgstr "立即搜尋(_F)"
 
-# calendar/gui/e-calendar-table.c:159
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "列印摘要"
-
-# calendar/gui/e-calendar-table.c:159
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "列印摘要"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "重新載入"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "重新載入檢視器"
-
 # views/addressbook/galview.xml.h:2
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -21686,8 +21646,8 @@ msgstr "依類別(_C)"
 msgid "_Tasks"
 msgstr "工作(_T)"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -21982,24 +21942,24 @@ msgstr "立即搜尋(_F)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "文字"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
 msgstr "立即搜尋"
@@ -22018,6 +21978,269 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+# addressbook/gui/component/addressbook-config.glade.h:2
+#~ msgid "Addressbook Sources"
+#~ msgstr "目錄服務來源"
+
+# camel/camel-pgp-context.c:1073
+#~ msgid "No data provided"
+#~ msgstr "沒有提供資料"
+
+# camel/providers/local/camel-mbox-store.c:94
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法開啟檔案“%s”：\n"
+#~ "%s"
+
+# camel/camel-session.c:479
+#, fuzzy
+#~ msgid ""
+#~ "Could not create directory `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法建立目錄 %s：\n"
+#~ "%s"
+
+# camel/providers/local/camel-mbox-store.c:110
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法建立檔案“%s”：\n"
+#~ "%s"
+
+# camel/providers/local/camel-mh-store.c:110
+#~ msgid "`%s' is not a directory."
+#~ msgstr "“%s”不是一個目錄。"
+
+# shell/e-shell-importer.c:371
+#~ msgid "Importing %s as %s"
+#~ msgstr "匯入 %s 為 %s"
+
+# camel/providers/local/camel-local-store.c:183
+#~ msgid "Scanning mail filters"
+#~ msgstr "掃描郵件過濾器"
+
+# camel/providers/imap/camel-imap-folder.c:364
+#~ msgid "Scanning directory"
+#~ msgstr "掃描目錄"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "不能複製資料夾：%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#~ msgid "Cannot move folder: %s"
+#~ msgstr "不能移動資料夾：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "不能將資料夾移動到它自己。"
+
+# shell/e-setup.c:230
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "不能複製資料夾到它自己。"
+
+#~ msgid "Cannot move a folder into one of its descendants."
+#~ msgstr "不能將資料夾移至其子資料夾之中。"
+
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "指定要複製資料夾“%s”進去的資料夾："
+
+# ui/evolution.xml.h:7
+#, fuzzy
+#~ msgid "Copy Folder"
+#~ msgstr "複製資料夾"
+
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "指定要移動資料夾“%s”進去的資料夾："
+
+#, fuzzy
+#~ msgid "Move Folder"
+#~ msgstr "移動資料夾"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#~ msgid ""
+#~ "Cannot delete folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能刪除資料夾：\n"
+#~ "%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "確定要刪除資料夾“%s”？"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能重新命名資料夾：\n"
+#~ "%s"
+
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "選擇的資料夾不屬於其他使用者"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能移除資料夾：\n"
+#~ "%s"
+
+# shell/e-shortcuts-view.c:134
+#, fuzzy
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "新增功能群組"
+
+# shell/e-shortcuts-view.c:137
+#~ msgid "Group name:"
+#~ msgstr "群組名稱:"
+
+# shell/e-shortcuts-view.c:260
+#, fuzzy
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr ""
+#~ "您確定要將群組\n"
+#~ "“%s”自功能列移除？"
+
+# shell/e-shortcuts-view.c:295
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "重新命名功能群組"
+
+# shell/e-shortcuts-view.c:295
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "更改選定功能群組的名稱為："
+
+# shell/e-shortcuts-view.c:276
+#~ msgid "_Small Icons"
+#~ msgstr "小圖示(_S)"
+
+# shell/e-shortcuts-view.c:277
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "以小圖示顯示功能項目"
+
+# shell/e-shortcuts-view.c:279
+#~ msgid "_Large Icons"
+#~ msgstr "大圖示(_L)"
+
+# shell/e-shortcuts-view.c:280
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "以大圖示顯示功能項目"
+
+# shell/e-shortcuts-view.c:291
+#, fuzzy
+#~ msgid "_Add Group..."
+#~ msgstr "新增群組(_N)..."
+
+# shell/e-shortcuts-view.c:292
+#~ msgid "Create a new shortcut group"
+#~ msgstr "新增功能群組"
+
+# shell/e-shortcuts-view.c:294
+#~ msgid "_Remove this Group..."
+#~ msgstr "移除這個群組(_R)..."
+
+# shell/e-shortcuts-view.c:295
+#~ msgid "Remove this shortcut group"
+#~ msgstr "移除這個功能群組"
+
+# shell/e-shortcuts-view.c:294
+#~ msgid "Re_name this Group..."
+#~ msgstr "重新命名這個群組(_N)..."
+
+# shell/e-shortcuts-view.c:295
+#~ msgid "Rename this shortcut group"
+#~ msgstr "更改這個功能群組的名稱"
+
+# shell/e-shortcuts-view.c:300
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "隱藏功能列(_H)"
+
+# shell/e-shortcuts-view.c:301
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "隱藏功能列"
+
+# shell/e-shortcuts-view.c:292
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "建立預設功能(_D)"
+
+# shell/e-shortcuts-view.c:292
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "建立預設功能"
+
+# shell/e-shortcuts-view.c:295
+#, fuzzy
+#~ msgid "Rename Shortcut"
+#~ msgstr "重新命名功能"
+
+# shell/e-shortcuts-view.c:295
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "更改選定功能的名稱為："
+
+# ui/evolution.xml.h:26
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "開啟連結至這個功能的資料夾"
+
+# ui/evolution.xml.h:25
+#~ msgid "Open in New _Window"
+#~ msgstr "在新視窗開啟(_W)"
+
+# ui/evolution-mail.xml.h:59
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "使用新視窗開啟連結至這個功能的資料夾"
+
+# shell/e-shortcuts-view.c:295
+#~ msgid "Rename this shortcut"
+#~ 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
+#~ msgid "Re_move"
+#~ msgstr "移除(_M)"
+
+# shell/e-shortcuts-view.c:388
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "將功能項目從功能列移除"
+
+# shell/e-shortcuts.c:381
+#~ msgid "Error saving shortcuts."
+#~ msgstr "儲存功能項目時發生錯誤。"
+
+# ui/evolution.xml.h:62
+#~ msgid "Shortcuts"
+#~ msgstr "功能"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "“%s”在“%s”"
+
+# calendar/gui/e-calendar-table.c:159
+#~ msgid "Print Summary"
+#~ msgstr "列印摘要"
+
+# calendar/gui/e-calendar-table.c:159
+#~ msgid "Print summary"
+#~ msgstr "列印摘要"
+
+#~ msgid "Reload"
+#~ msgstr "重新載入"
+
+#~ msgid "Reload the view"
+#~ msgstr "重新載入檢視器"
+
 # mail/folder-browser.c:713
 #~ msgid "Copy to folder..."
 #~ msgstr "複製至資料夾..."
@@ -22850,24 +23073,9 @@ msgstr "%s (%d%% 完成)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-#~ msgid "Evolution LDIF importer"
-#~ msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
 #~ msgstr "Evolution 郵件編輯器。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-#~ msgid "Evolution VCard Importer"
-#~ msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Evolution 郵件編輯器。"
-
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #~ msgid "Searching..."
@@ -31997,12 +32205,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Appointments"
 #~ msgstr "約會"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#, fuzzy
-#~ msgid "No appointments."
-#~ 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
@@ -32563,9 +32765,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Moderate mist"
 #~ msgstr "中靄"
 
-#~ msgid "Thick mist"
-#~ msgstr "濃靄"
-
 #~ msgid "Shallow mist"
 #~ msgstr "淺靄"
 
@@ -33140,10 +33339,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Create a new window displaying this folder"
 #~ msgstr "建立一個新的視窗來顯示這個資料夾"
 
-# ui/evolution.xml.h:47
-#~ msgid "Delete this folder"
-#~ msgstr "刪除這個資料夾"
-
 # ui/evolution.xml.h:14
 #~ msgid "Display a different folder"
 #~ msgstr "顯示一個不同的資料夾"